setting a Winix Licence: 2 Clause BSD Licence

changed: version to 0.6.2



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

Makefile

@@ -1,29 +1,51 @@
 # Makefile for GNU make
 
+include Makefile.dep
 
-ifndef CXX
-CXX = g++
+
+ifeq ($(OSTYPE), FreeBSD)
+	CXX = clang++
+else
+	CXX = g++-4.8
 endif
 
+
+
 ifndef CXXFLAGS
-CXXFLAGS = -fPIC -Wall -O2 -pthread -I/usr/local/include -I/home/tomek/roboczy/winix -I/home/tomek/roboczy/ezc/src -I/home/tomek/roboczy/tito/src -I/home/tomek/roboczy/pikotools -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
+CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++11 -I/usr/local/include -I/usr/include/postgresql -DEZC_USE_WINIX_LOGGER -DEZC_HAS_SPECIAL_STREAM
+endif
+
+
+ifndef CXXWINIXINCLUDEFLAGS
+# these flags are used for compiling and making dependencies (make depend)
+# it's better to not using any system directories like -I/usr/local/include here 
+CXXWINIXINCLUDEFLAGS = -I../../winix -I../../../winix -I../../ezc/src -I../../../ezc/src -I../../tito/src -I../../../tito/src -I../../pikotools -I../../../pikotools
 endif
 
 ifndef LDFLAGS
 LDFLAGS = -L/usr/local/lib
 endif
 
+# this macro is used in ezc's Makefile
+EZC_USE_WINIX_LOGGER = yes
+
+
+# for make install
+winix_install_dir = /usr/local/winix
+
 
 export CXX
 export CXXFLAGS
+export CXXWINIXINCLUDEFLAGS
 export LDFLAGS
+export EZC_USE_WINIX_LOGGER
 
 
 all: winix.so plugins winix
 
 
 
-winix.so: FORCE
+winix.so: $(winix.src.files)
 	@cd core         ; $(MAKE) -e
 	@cd db           ; $(MAKE) -e
 	@cd functions    ; $(MAKE) -e
@@ -32,13 +54,12 @@ winix.so: FORCE
 	@cd ../ezc/src   ; $(MAKE) -e
 	@cd ../tito/src  ; $(MAKE) -e
 	@cd ../pikotools ; $(MAKE) -e
-	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a ../pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lfetch -lpthread -Wl,-no-whole-archive
+	$(CXX) -shared -rdynamic -Wl,-whole-archive -o winix.so $(CXXFLAGS) $(CXXWINIXINCLUDEFLAGS) core/*.o db/*.o functions/*.o templates/*.o notify/*.o ../ezc/src/ezc.a ../tito/src/tito.a ../pikotools/utf8/utf8.a ../pikotools/space/space.a ../pikotools/mainparser/mainparser.a ../pikotools/date/date.a $(LDFLAGS) -lfcgi -lpq -lz -lpthread -lcurl -Wl,-no-whole-archive
 
 
-winix: winix.so FORCE
-	@cd main       ; $(MAKE) -e
-	# use the full path with winix.so
-	$(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) main/*.o /home/tomek/roboczy/winix/winix.so 
+winix: winix.so $(winix.src.files)
+	@cd main ; $(MAKE) -e
+	$(CXX) -o winix $(CXXFLAGS) $(LDFLAGS) main/*.o winix.so -lfcgi 
 
 
 
@@ -96,33 +117,42 @@ depend:
 	@cd ../tito/src          ; $(MAKE) -e depend
 	@cd ../pikotools         ; $(MAKE) -e depend
 	@cd main                 ; $(MAKE) -e depend
+	echo -n "winix.src.files = " > Makefile.dep
+	find -E .            -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
+	find -E ../ezc/src   -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
+	find -E ../tito/src  -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
+	find -E ../pikotools -type f -regex ".*\.h|.*\.cpp" | xargs -I foo echo -n foo " " >> Makefile.dep
 
 
 
 install: all
-	# binaries
-	mkdir -p /usr/local/winix/bin
-	cp winix.so /usr/local/winix/bin
-	# use the full path with winix.so (we have to recompile winix with a new path to winix.so)
-	$(CXX) -o /usr/local/winix/bin/winix $(CXXFLAGS) main/*.o /usr/local/winix/bin/winix.so
+	# installing binaries
+	rm -Rf $(winix_install_dir)/bin
+	mkdir -p $(winix_install_dir)/bin
+	cp winix $(winix_install_dir)/bin
+	cp winix.so $(winix_install_dir)/bin
 	# etc configs
-	mkdir -p /usr/local/winix/etc
-	cp -rf etc/ /usr/local/winix/etc/
-	find /usr/local/winix/etc/ -type d -name ".svn" | xargs -I foo rm -fr foo
+	rm -Rf $(winix_install_dir)/etc
+	mkdir -p $(winix_install_dir)/etc
+	cp -rf etc/* $(winix_install_dir)/etc/
 	# html templates
-	mkdir -p /usr/local/winix/html
-	cp -rf html/ /usr/local/winix/html/
-	find /usr/local/winix/html/ -type d -name ".svn" | xargs -I foo rm -fr foo
+	rm -Rf $(winix_install_dir)/html
+	mkdir -p $(winix_install_dir)/html
+	cp -rf html/* $(winix_install_dir)/html/
 	# txt templates
-	mkdir -p /usr/local/winix/txt
-	cp -rf txt/ /usr/local/winix/txt/
-	find /usr/local/winix/txt/ -type d -name ".svn" | xargs -I foo rm -fr foo
+	rm -Rf $(winix_install_dir)/txt
+	mkdir -p $(winix_install_dir)/txt
+	cp -rf txt/* $(winix_install_dir)/txt/
 	# locales
-	mkdir -p /usr/local/winix/locale
-	cp -rf locale/ /usr/local/winix/locale/
-	find /usr/local/winix/locale/ -type d -name ".svn" | xargs -I foo rm -fr foo
+	rm -Rf $(winix_install_dir)/locale
+	mkdir -p $(winix_install_dir)/locale
+	cp -rf locale/* $(winix_install_dir)/locale/
 	# plugins
-	mkdir -p /usr/local/winix/plugins
-	find plugins/ -name "*.so" | xargs -I foo cp foo /usr/local/winix/plugins/
-	# removed provileges for others
-	find /usr/local/winix -exec chmod o-r,o-x,o-w "{}" "+"
+	rm -Rf $(winix_install_dir)/plugins
+	mkdir -p $(winix_install_dir)/plugins
+	find plugins/ -name "*.so" | xargs -I foo cp foo $(winix_install_dir)/plugins/
+	# deleting subversion directories
+	find $(winix_install_dir) -type d -name ".svn" | xargs -I foo rm -fr foo
+	# removing privileges for others
+	find $(winix_install_dir) -exec chmod o-r,o-x,o-w "{}" "+"
+

core/Makefile

@@ -5,11 +5,11 @@ all: $(o)
 
 
 %.o: %.cpp
-	$(CXX) -c $(CXXFLAGS) $<
+	$(CXX) -c $(CXXFLAGS) $(CXXWINIXINCLUDEFLAGS) $<
 
 
 depend:
-	makedepend -Y. -I.. -I../../ezc/src -I../../pikotools -I../../tito/src -f- *.cpp > Makefile.dep
+	makedepend -Y. $(CXXWINIXINCLUDEFLAGS) -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
 

core/acceptbaseparser.cpp

@@ -1,15 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
+#include <cstdlib>
 #include "acceptbaseparser.h"
 
 
+namespace Winix
+{
+
+
+
 
 bool AcceptBaseParser::IsWhite(int c)
 {
@@ -111,3 +142,7 @@ void AcceptBaseParser::Parse(const char * str)
 }
 
 
+
+
+} // namespace Winix
+

core/acceptbaseparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_acceptbaseparser
@@ -13,6 +38,11 @@
 #include <string>
 
 
+namespace Winix
+{
+
+
+
 
 // sample (you must create your own class derived from this one):
 // object.Parse("   text/html  ;  ,  ; q = 45, application  /   xhtml+xml  ; q  = 0.4   ,    application/xml   ;   q  =  0.9  ,  */*   ;  q   =  0.8    ");
@@ -43,5 +73,8 @@ private:
 
 
 
+} // namespace Winix
+
+
 
 #endif

core/acceptencodingparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_acceptencodingparser
@@ -14,6 +39,11 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
+
 class AcceptEncodingParser : public AcceptBaseParser
 {
 public:
@@ -82,4 +112,7 @@ private:
 
 
 
+} // namespace Winix
+
+
 #endif

core/app.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_app
@@ -37,6 +62,12 @@
 
 
 
+namespace Winix
+{
+
+
+
+
 class App
 {
 public:
@@ -87,7 +118,7 @@ public:
 	Functions functions;
 
 	// false at the beginning
-	// !! moze to do loggera dac?
+	// !! IMPROVE ME moze to do loggera dac?
 	bool stdout_is_closed;
 
 
@@ -112,16 +143,18 @@ private:
 	CookieParser cookie_parser;
 	AcceptEncodingParser accept_encoding_parser;
 	Compress compress;
-	std::wstring clean_html, html_with_debug;
 	FCGX_Request fcgi_request;
 	int fcgi_socket;
 	Synchro synchro;
 	pthread_t signal_thread;
 	std::string url_to_fetch_on_exit;
-	std::string source_a;
-	std::string sendh_t, sendh_t2, sendh_t3;
-	std::string sendfilea, sendfile2a;
 	std::string send_data_buf;
+	PT::SpaceToJSON json_generic_serializer;
+	TextStream<std::wstring> json_out_stream;
+	std::string aheader_name, aheader_value;
+	std::wstring html_filtered;
+	std::string output_8bit;
+	BinaryPage compressed_output;
 
 	bool CheckAccessFromPlugins();
 	void ProcessRequestThrow();
@@ -133,16 +166,17 @@ private:
 	void CheckPostRedirect();
 	void MakePage();
 	void Make();
-	void SaveSessionsIfNeeded(); // !! wywalic do menagera sesji??
+	void SaveSessionsIfNeeded(); // !! IMPROVE ME wywalic do menagera sesji??
 	void LogAccess();
 	void SendData(const BinaryPage & page, FCGX_Stream * out);
+	void CreateJSONAnswer();
 
 	void ReadRequest();
 	void SendTextAnswer();
 	void SendBinaryAnswer();
 	void SendAnswer();
 
-	void PrintEnv();
+	void LogEnvironmentVariables();
 
 	void SetEnv(const char * & env, const char * name);
 	void ReadEnvVariables();
@@ -151,25 +185,32 @@ private:
 	void CheckIE();
 	void CheckKonqueror();
 	void CheckRequestMethod();
-	void CheckFCGIRole();
 	void CheckSSL();
 	void SetSubdomain();
 
+
+	Header GetHTTPStatusCode();
 	void PrepareSessionCookie();
-	void AddDebugInfo(std::wstring & out);
-	void FilterCompressSend(bool compressing, int compress_encoding, const std::wstring & source_ref);
-	bool SendHeadersStaticCreateResource();
-	void SendHeadersStatic();
-	void SendHeaderContentType();
-	void SendHeadersForbidden();
-	void SendHeadersRedirect();
-	void SendHeadersSendFile();
-	void SendHeadersCompression(int compress_encoding);
-	void SendHeadersNormal(Header header);
-	void SendHeaders(bool compressing, int compress_encoding, Header header);
+	void FilterContent();
+	void SendHeaders();
+	void SendCookies();
+	bool AddHeader(const wchar_t * name, const wchar_t * value);
+	bool AddHeader(const std::wstring & name, const std::wstring & value);
+	bool AddHeader(const wchar_t * name, const PT::WTextStream & value);
+	bool AddHeader(const std::wstring & name, const PT::WTextStream & value);
+	bool PrepareHeadersStaticCreateResource(PT::WTextStream & out_path);
+	void PrepareHeadersStatic();
+	void PrepareHeaderContentType();
+	void PrepareHeadersForbidden();
+	void PrepareHeadersRedirect();
+	void PrepareHeadersSendFile();
+	void PrepareHeadersCompression(int compress_encoding);
+	void PrepareHeadersNormal(Header header, size_t output_size);
+	void PrepareHeaders(bool compressing, int compress_encoding, Header header, size_t output_size);
 	int  SelectDeflateVersion();
 	void SelectCompression(size_t source_len, bool & compression_allowed, int & compression_encoding);
-	bool CanSendContent(Header header);
+	bool CanSendContent();
+	void ClearAfterRequest();
 
 	void LogUser(const char * msg, uid_t id);
 	void LogGroup(const char * msg, gid_t id, bool put_logend = true);
@@ -183,10 +224,15 @@ private:
 
 	void CreateStaticTree();
 
-	// !! dodac do session managera?
+	// !! IMPROVE ME
+	// !! move to the session manager?
 	time_t last_sessions_save;
 };
 
+
+} // namespace Winix
+
+
 #endif
 
 

core/basethread.cpp

@@ -1,16 +1,44 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <errno.h>
 #include "basethread.h"
 
 
+namespace Winix
+{
+
 
 BaseThread::BaseThread() : thread_signal(PTHREAD_COND_INITIALIZER)
 {
@@ -237,3 +265,7 @@ pthread_attr_t attr;
 return res == 0;
 }
 
+
+} // namespace Winix
+
+

core/basethread.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_basethread
@@ -14,6 +39,11 @@
 #include "synchro.h"
 
 
+namespace Winix
+{
+
+
+
 
 class BaseThread
 {
@@ -120,6 +150,9 @@ protected:
 
 
 
+} // namespace Winix
+
+
 
 #endif
 

core/bbcodeparser.cpp

@@ -1,15 +1,44 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include "bbcodeparser.h"
 
 
+namespace Winix
+{
+
+
 
 
 bool BBCODEParser::Equal(const wchar_t * str1, const wchar_t * str2)
@@ -590,3 +619,8 @@ void BBCODEParser::Uninit()
 	if( has_open_ul_tag )
 		(*out_string) += L"</ul>\n";
 }
+
+
+
+} // namespace Winix
+

core/bbcodeparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #ifndef headerfile_winix_core_bbcodeparser
@@ -13,6 +38,9 @@
 #include "htmlfilter.h"
 
 
+namespace Winix
+{
+
 
 
 class BBCODEParser : public HTMLFilter
@@ -90,4 +118,8 @@ class BBCODEParser : public HTMLFilter
 	bool has_open_li_tag; // has open html <li> tag
 };
 
+
+} // namespace Winix
+
+
 #endif

core/compress.cpp

@@ -1,16 +1,45 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "compress.h"
 #include "log.h"
 
 
+namespace Winix
+{
+
+
 
 
 Compress::Compress()
@@ -153,7 +182,9 @@ return 0;
 
 
 
-int Compress::MakeCompress(z_stream & strm, const char * source, size_t source_len, FCGX_Stream * out_stream, int encoding)
+
+
+int Compress::MakeCompress(z_stream & strm, const char * source, size_t source_len, BinaryPage & out_stream, int encoding)
 {
 int ret, flush;
 size_t have;
@@ -180,7 +211,7 @@ size_t have;
 
 			have = buffer_max_len - strm.avail_out;
 			last_out_size += have;
-			FCGX_PutStr(buffer_out, have, out_stream);
+			out_stream.write(buffer_out, have);
 		}
 		while( strm.avail_out == 0 );
 
@@ -203,6 +234,7 @@ return 0;
 }
 
 
+
 void Compress::CopyToInputBuffer(BinaryPage::const_iterator & i, size_t len)
 {
 	for(size_t a=0 ; a<len ; ++a, ++i)
@@ -331,12 +363,13 @@ void Compress::PutLog(size_t source_len, int encoding)
 	3 - not inited (use Init() first)
 	100 - unknown
 */
-int Compress::CompressAndPut(const char * source, size_t source_len, FCGX_Stream * out_stream, int encoding)
+int Compress::Compressing(const char * source, size_t source_len, BinaryPage & out_stream, int encoding)
 {
 int ret;
 z_stream * pstrm;
 
 	last_out_size = 0;
+	out_stream.clear();
 	
 	if( !ready_for_compress )
 	{
@@ -344,6 +377,8 @@ z_stream * pstrm;
 		return 3;
 	}
 	
+	// !! CHECK ME
+	// it is correct to immediately return? what about headers in the compressed page?
 	if( source_len == 0 )
 		return 0;
 
@@ -379,6 +414,8 @@ z_stream * pstrm;
 		return 3;
 	}
 
+	// !! CHECK ME
+	// it is correct to immediately return? what about headers in the compressed page?
 	if( in.empty() )
 		return 0;
 
@@ -390,3 +427,7 @@ z_stream * pstrm;
 return ret;
 }
 
+
+
+} // namespace Winix
+

core/compress.h

@@ -1,21 +1,49 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_compress
 #define headerfile_winix_core_compress
 
 #include <cstring>
-#include <fcgiapp.h>
 #include <zlib.h>
 #include "requesttypes.h"
 
 
+namespace Winix
+{
+
+
 
 class Compress
 {
@@ -34,7 +62,7 @@ public:
 		1 - deflate
 		2 - gzip
 	*/
-	int CompressAndPut(const char * source, size_t source_len, FCGX_Stream * out_stream, int encoding = 2);
+	int Compressing(const char * source, size_t source_len, BinaryPage & out_stream, int encoding = 2);
 	int Compressing(const BinaryPage & in, BinaryPage & out, int encoding = 2);
 
 
@@ -45,7 +73,7 @@ private:
 	bool InitDeflate();
 	bool InitGzip();
 
-	int MakeCompress(z_stream & strm, const char * source, size_t source_len, FCGX_Stream * out_stream, int encoding);
+	int MakeCompress(z_stream & strm, const char * source, size_t source_len, BinaryPage & out_stream, int encoding);
 	int MakeCompress(z_stream & strm, const BinaryPage & page, BinaryPage & out, int encoding);
 	z_stream * SelectStream(int encoding);
 	void ResetStream(z_stream * pstrm, int encoding);
@@ -67,4 +95,7 @@ private:
 };
 
 
+} // namespace Winix
+
+
 #endif

core/config.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "config.h"
@@ -14,6 +39,10 @@
 #include "crypt.h"
 
 
+namespace Winix
+{
+
+
 
 Config::Config()
 {
@@ -113,10 +142,13 @@ void Config::AssignValues(bool stdout_is_closed)
 	log_request				= Int(L"log_request", 1);
 	log_save_each_line 		= Bool(L"log_save_each_line", false);
 	log_time_zone_id		= Size(L"log_time_zone_id", 34);
+	log_server_answer		= Bool(L"log_server_answer", false);
 	log_stdout				= Bool(L"log_stdout", false);
 	log_db_query			= Bool(L"log_db_query", false);
 	log_plugin_call			= Bool(L"log_plugin_call", false);
 	log_post_value_size 	= Size(L"log_post_value_size", 80);
+	log_env_variables		= Bool(L"log_env_variables", false);
+	log_http_answer_headers = Bool(L"log_http_answer_headers", false);
 
 	post_file_max			= Size(L"post_file_max", 8388608); // 8 MB
 
@@ -125,6 +157,7 @@ void Config::AssignValues(bool stdout_is_closed)
 	NoLastSlash(upload_dir);
 	NoLastSlash(common_dir);
 
+	upload_group			= AText(L"upload_group");
 	upload_dirs_chmod		= Int(L"upload_dirs_chmod", 0750);
 	upload_files_chmod		= Int(L"upload_files_chmod", 0640);
 	ListText(L"static_dirs", static_dirs);
@@ -150,7 +183,7 @@ void Config::AssignValues(bool stdout_is_closed)
 	templates_index			= Text(L"templates_index", L"index.html");
 	template_only_root_use_template_fun = Bool(L"template_only_root_use_template_fun", false);
 
-	http_session_id_name	= AText(L"http_session_id_name");
+	http_session_id_name	= Text(L"http_session_id_name", L"session_id");
 	db_database				= AText(L"db_database");
 	db_user					= AText(L"db_user");
 	db_pass					= AText(L"db_pass");
@@ -195,6 +228,7 @@ void Config::AssignValues(bool stdout_is_closed)
 	html_filter_tabs		= Size(L"html_filter_tabs", 2);
 	html_filter_orphans		= Bool(L"html_filter_orphans", true);
 	html_filter_orphans_mode_str = Text(L"html_filter_orphans_mode_str", L"nbsp");
+	html_filter_nofilter_tag     = Text(L"html_filter_nofilter_tag", L"nofilter");
 
 	locale_dir				= Text(L"locale_dir");
 	locale_dir_default		= Text(L"locale_dir_default");
@@ -205,7 +239,6 @@ void Config::AssignValues(bool stdout_is_closed)
 	title_separator			= Text(L"title_separator", L" / ");
 
 	http_header_send_file 	= Text(L"http_header_send_file", L"X-LIGHTTPD-send-file");
-	debug_info 				= Bool(L"debug_info", false);
 
 	editors_html_safe_mode 	= Bool(L"editors_html_safe_mode", true);
 	editors_html_safe_mode_skip_root = Bool(L"editors_html_safe_mode_skip_root", true);
@@ -232,10 +265,11 @@ void Config::AssignValues(bool stdout_is_closed)
 	pattern_cacher_how_many_delete = Size(L"pattern_cacher_how_many_delete", 30);
 
 	content_type_header 	= Int(L"content_type_header", 0);
-	umask = Int(L"umask", 0222);
+	umask 					= Int(L"umask", 0222);
 
 	ezc_max_elements		= Size(L"ezc_max_elements", 50000);
 	ezc_max_loop_elements 	= Size(L"ezc_max_loop_elements", 5000);
+	ezc_out_streams_size	= Size(L"ezc_out_streams_size", 16);
 
 	account_need_email_verification     = Bool(L"account_need_email_verification", true);
 	reset_password_code_expiration_time = Long(L"reset_password_code_expiration_time", 86400);
@@ -258,6 +292,8 @@ void Config::AssignValues(bool stdout_is_closed)
 	incorrect_login_cannot_login_mode			= Int(L"incorrect_login_cannot_login_mode", 0);
 	incorrect_login_cannot_login_treshold		= Size(L"incorrect_login_cannot_login_treshold", 20);
 	incorrect_login_cannot_login_delay			= Size(L"incorrect_login_cannot_login_delay", 1800);
+
+	pid_file				= Text(L"pid_file", L"");
 }
 
 
@@ -284,6 +320,8 @@ void Config::SetAdditionalVariables()
 
 	if( locale_files.empty() )
 		locale_files.push_back(L"en");
+
+	upload_group_int = GetGroupId(upload_group);
 }
 
 
@@ -433,6 +471,28 @@ bool Config::ListText(const std::wstring & name, std::vector<std::wstring> & lis
 }
 
 
+
+bool Config::HasValue(const wchar_t * name, const wchar_t * value)
+{
+	return space.HasValue(name, value);
+}
+
+bool Config::HasValue(const wchar_t * name, const std::wstring & value)
+{
+	return space.HasValue(name, value);
+}
+
+bool Config::HasValue(const std::wstring & name, const wchar_t * value)
+{
+	return space.HasValue(name, value);
+}
+
+bool Config::HasValue(const std::wstring & name, const std::wstring & value)
+{
+	return space.HasValue(name, value);
+}
+
+
 void Config::Print(std::wostream & out)
 {
 	space.Serialize(out);
@@ -442,5 +502,8 @@ void Config::Print(std::wostream & out)
 
 
 
+} // namespace Winix
+
+
 
 

core/config.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_config
@@ -15,6 +40,10 @@
 #include "htmlfilter.h"
 
 
+namespace Winix
+{
+
+
 
 
 
@@ -30,11 +59,11 @@ public:
 	// default: true
 	bool demonize;
 
-	// system user name (to which drop privileges)
+	// system user's name to whom winix should drop privileges
 	// used only if winix is started as the root
 	std::string user;
 
-	// system group name (to which drop privileges)
+	// system group's name to which drop privileges
 	// used only if winix is started as the root
 	std::string group;
 
@@ -47,21 +76,23 @@ public:
 	// log file name, log file name for notifications (sending emails, etc)
 	std::string log_file, log_notify_file;
 	
+	// the log level (how much info should be inserted to logs)
 	// 1 - minimum
 	// 2 - (default)
 	// 3 - maximum - all logs
 	int log_level;
 
 	// logging to stdout too
-	// only if demonize is 'false'
+	// this option is valid only if 'demonize' option is set to 'false'
 	// default: false
 	bool log_stdout;
 
 	// how many requests should be saved in the same time
+	// if you have a very busy server you can incrase this value
 	// default: 1
 	int log_request;
 
-	// whether to save each line of the config (use it for debug purposes)
+	// whether to save each line of the config (used for debugging purposes)
 	// default: false
 	bool log_save_each_line;
 
@@ -71,7 +102,12 @@ public:
 	// default: 34 (Coordinated Universal Time UTC+00:00)
 	size_t log_time_zone_id;
 
+	// put to log what server is sending back to the client (html/json etc)
+	// default: false
+	bool log_server_answer;
+
 	// logging db queries
+	// warning: use it only on a developer's server as it logs the hashes of passwords too
 	// default: false
 	bool log_db_query;
 
@@ -81,12 +117,20 @@ public:
 
 	// how many characters in values should be logged from POST parameters
 	// default: 80
-	// set to 0 to turn off
+	// set to 0 to turn it off
 	size_t log_post_value_size;
 
 	// request delimiter in the log file, default "---------"
 	std::wstring log_delimiter;
 
+	// log environment variables (fastcgi environment)
+	bool log_env_variables;
+
+	// log headers (+cookies) which are returned to the client
+	// this is what winix has generated -- the web server can change or add other headers
+	// default: false
+	bool log_http_answer_headers;
+
 	// fast cgi: socket (unix domain)
 	std::string fcgi_socket;
 
@@ -116,39 +160,46 @@ public:
 	// default: index.html
 	std::wstring templates_index;
 
-	// if true then only root can use 'template' function
+	// if true then only root can use 'template' winix function
 	// default: false
 	bool template_only_root_use_template_fun;
 
+	// the database name, user name and a password for the PostgreSQL database
 	std::string db_database;
 	std::string db_user;
 	std::string db_pass;
 
-	std::string http_session_id_name;
+	// the name of the cookie which has the session identifier
+	std::wstring http_session_id_name;
 
 	// string used in a place where is a user (or group) selected
+	// !! IMPROVE ME should be moved to locales
 	std::wstring priv_no_user;
 	std::wstring priv_no_group;
 
-	// time in seconds when the user will be automatically logged out (iddle time)
+	// time in seconds when a user will be automatically logged out (iddle time)
+	// default: 10800 = 3 hours
 	int session_max_idle;
 	
-	// time in seconds when the user will be automatically logged out (when he selected 'remember me' option)
+	// time in seconds when a user will be automatically logged out
+	// when he has selected the 'remember me' option when logging in
 	// this time is usually greater than session_max_idle
+	// default: 16070400 = 3 months
 	int session_remember_max_idle;
 
-	// this file is used when the program is starting and ending
+	// a file to which winix stores sessions info
+	// it is used when winix starts (boots) and quits
 	std::string session_file;
 
 	// how many sessions can be (zero turn off this checking)
 	// default: 1000000 (one milion)
 	size_t session_max;
 
-	// allow the html output to be compressed
+	// allow the winix output to be compressed
 	// default: true
 	bool compression;
 
-	// if the output is shorter than this value then it will not be compressed
+	// compress only if the output is greater or equal to this value
 	// default: 512 bytes
 	size_t compression_page_min_size;
 
@@ -175,12 +226,12 @@ public:
 	bool html_filter_trim_white;
 
 	// when long words should be broken (a space will be inserted)
-	// default: after 60 non white characters will be put a space
+	// default: after 60 non white characters there will be put a space
 	// set zero to turn off
 	size_t html_filter_break_word;
 
 	// when long lines should be broken (a new line character will be inserted)
-	// default: 80
+	// default: 110
 	// set zero to turn off
 	size_t html_filter_wrap_line;
 
@@ -198,10 +249,18 @@ public:
 	std::wstring html_filter_orphans_mode_str;
 	HTMLFilter::OrphanMode html_filter_orphans_mode;
 
+	// the html nofilter tag
+	// content betweeng these tags (opening and closing) will not be filtered
+	// and this tag will not be included in the html output
+	// default: nofilter
+	std::wstring html_filter_nofilter_tag;
+
 	// the url of a new empty item (if there is not the subject too)
+	// !! IMPROVE ME should be moved to locale
 	std::wstring item_url_empty;
 
 	// maximum length of a file send by post multipart form
+	// default: 8388608 - 8MB
 	// 0 - not used
 	size_t post_file_max;
 
@@ -234,6 +293,14 @@ public:
 	// default: empty
 	std::wstring common_dir;
 
+	// system group's name for new uploaded files (created directories in the file system)
+	// it can be empty (it is not used then)
+	std::string upload_group;
+
+	// this value will be set based on upload_group
+	// will be -1 if upload_group is empty or if it is invalid
+	int upload_group_int;
+
 	// chmod of newly created directories (under upload_dir)
 	// default: 0750
 	int upload_dirs_chmod;
@@ -385,9 +452,6 @@ public:
 	// default: X-LIGHTTPD-send-file
 	std::wstring http_header_send_file;
 
-	// prints additional information (in the end of the html page as a commentary)
-	bool debug_info;
-
 	// in editors (emacs, ckeditor,...) the html will be filtered and unsafe tags
 	// will be dropped (script, frame, etc.)
 	// default: true;
@@ -481,6 +545,10 @@ public:
 	// default: 5000 (from ezc generator)
 	size_t ezc_max_loop_elements;
 
+ 	// how many output streams do we have in Request class
+ 	// default: 16 (64 maximum)
+ 	size_t ezc_out_streams_size;
+
 	// when true then when a user want to create a new account
 	// he has to provide his email and a message will be sent back to him
 	// with a link to activate the account
@@ -585,6 +653,11 @@ public:
  	// will be taken accordingly
  	size_t incorrect_login_cannot_login_delay;
 
+ 	// pid file (a full path to a pid file)
+ 	// default: empty which means there is not a pid file used
+ 	// pid file is saved after winix has dropped privileges
+ 	std::wstring pid_file;
+
 
 
 	Config();
@@ -612,6 +685,11 @@ public:
 	bool ListText(const wchar_t * name, std::vector<std::wstring> & list);
 	bool ListText(const std::wstring & name, std::vector<std::wstring> & list);
 
+	bool HasValue(const wchar_t * name, const wchar_t * value);
+	bool HasValue(const wchar_t * name, const std::wstring & value);
+	bool HasValue(const std::wstring & name, const wchar_t * value);
+	bool HasValue(const std::wstring & name, const std::wstring & value);
+
 	// for debug
 	void Print(std::wostream & out);
 
@@ -635,6 +713,9 @@ private:
 
 
 
+} // namespace Winix
+
+
 
 
 #endif

core/cookieparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_cookieparser
@@ -16,12 +41,18 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
 
 class CookieParser : public HttpSimpleParser
 {
 
 	const char * cookie_string;
 	CookieTab * cookie_tab;
+	std::wstring temp_name, temp_value;
+	bool input_as_utf8;
 	
 
 protected:
@@ -35,19 +66,29 @@ protected:
 		return (int)(unsigned char)*(cookie_string++);	
 	}
 	
+	void ConvStr(const std::string & src, std::wstring & dst)
+	{
+		if( input_as_utf8 )
+			PT::UTF8ToWide(src, dst);
+		else
+			AssignString(src, dst);
+	}
 
 	virtual void Parameter(std::string & name, std::string & value)
 	{
 		// Cookie names are case insensitive according to section 3.1 of RFC 2965
+		// (we don't use locale here)
 		ToLower(name);
 		
-		std::pair<CookieTab::iterator, bool> res = cookie_tab->insert( std::make_pair(name, value) );	
+		ConvStr(name,  temp_name);
+		ConvStr(value, temp_value);
 		
-		log << log2 << "Cookie, name: \"" << name << "\", value: \"" << value << "\"";
+		std::pair<CookieTab::iterator, bool> res = cookie_tab->insert( std::make_pair(temp_name, temp_value) );
+		log << log2 << "Cookie, name: \"" << temp_name << "\", value: \"" << temp_value << "\"";
 		
 		if( res.second == false )
 		{
-			res.first->second = value;
+			res.first->second = temp_value;
 			log << " (overwritten)";
 		}
 			
@@ -60,6 +101,7 @@ public:
 
 	CookieParser()
 	{
+		input_as_utf8 = false;
 		HttpSimpleParser::separator               = ';';
 		HttpSimpleParser::value_can_be_quoted     = true;
 		HttpSimpleParser::skip_white_chars        = true;
@@ -67,6 +109,11 @@ public:
 	}
 
 
+	void UTF8(bool utf)
+	{
+		input_as_utf8 = utf;
+	}
+
 	// cookie_string can be null
 	void Parse(const char * cookie_string_, CookieTab & cookie_tab_)
 	{
@@ -80,4 +127,7 @@ public:
 
 
 
+} // namespace Winix
+
+
 #endif

core/crypt.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include <cstring>
@@ -14,6 +39,11 @@
 
 
 
+namespace Winix
+{
+
+
+
 void Crypt::SetConfig(Config * pconfig)
 {
 	config = pconfig;
@@ -312,3 +342,7 @@ void Crypt::PassHashCrypt(UserPass & up)
 		PassCrypt(config->pass_rsa_private_key, up);
 }
 
+
+
+} // namespace Winix
+

core/crypt.h

@@ -1,22 +1,51 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_crypt
 #define headerfile_winix_core_crypt
 
-
 #include <string>
 #include "run.h"
 #include "config.h"
 #include "user.h"
 
 
+namespace Winix
+{
+
+
+
 /*
 	the kind of hashes we are able to obtain in winix
 */
@@ -258,5 +287,8 @@ void Crypt::ConvertToHexForm(const std::string & in, StringType & out)
 
 
 
+} // namespace Winix
+
+
 #endif
 

core/cur.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_cur
@@ -15,6 +40,11 @@
 #include "mount.h"
 
 
+namespace Winix
+{
+
+
+
 /*
 	current request and session
 */
@@ -31,6 +61,8 @@ struct Cur
 
 
 
+} // namespace Winix
+
 
 
 #endif

core/dircontainer.cpp

@@ -1,16 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "dircontainer.h"
 #include "log.h"
 
 
+namespace Winix
+{
+
+
+
 std::wstring DirContainer::dir_etc = L"etc";
 std::wstring DirContainer::dir_var = L"var";
 
@@ -328,3 +358,8 @@ bool DirContainer::DelById(long id)
 	
 return true;
 }
+
+
+
+} // namespace Winix
+

core/dircontainer.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_dircontainer
@@ -15,6 +40,10 @@
 #include "item.h"
 
 
+namespace Winix
+{
+
+
 
 class DirContainer
 {
@@ -92,4 +121,8 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/dirs.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "dirs.h"
@@ -12,6 +37,9 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
 
 
 void Dirs::SetDb(Db * pdb)
@@ -517,7 +545,11 @@ void Dirs::CopyDirTab(const std::vector<Item*> & in, std::vector<Item*> & out)
 
 
 
-
+/*
+	!! IMPROVE ME
+	may dir_tab can be empty when link_to is not relative?
+	and now the algorith doesn't check if link_to is not relative (it only uses dir_tab)
+*/
 bool Dirs::AnalyzeDir(std::vector<Item*> & dir_tab, const std::wstring & link_to, size_t & i)
 {
 	size_t old_i;
@@ -752,3 +784,6 @@ void Dirs::LogDir(const std::vector<Item*> & dir_tab)
 
 
 
+
+} // namespace Winix
+

core/dirs.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_dirs
@@ -22,7 +47,13 @@
 #include "notify/notify.h"
 
 
+namespace Winix
+{
+
+
+// !! IMPROVE ME 
 // we do not support '..' in a path (for simplicity and security reasons)
+// (we will support '..' in the future)
 
 
 class Dirs
@@ -115,4 +146,7 @@ private:
 };
 
 
+} // namespace Winix
+
+
 #endif

core/error.h

@@ -1,16 +1,44 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_error
 #define headerfile_winix_core_error
 
 
+namespace Winix
+{
+
 
 
 #define WINIX_ERR_OK							0
@@ -77,4 +105,7 @@ typedef int Error;
 
 
 
+} // namespace Winix
+
+
 #endif

core/group.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_group
@@ -14,6 +39,10 @@
 #include <vector>
 
 
+namespace Winix
+{
+
+
 
 struct Group
 {
@@ -38,6 +67,8 @@ struct Group
 
 
 
+} // namespace Winix
+
 
 
 #endif

core/groups.cpp

@@ -1,15 +1,43 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "groups.h"
 
 
+namespace Winix
+{
+
 
 
 Groups::Groups()
@@ -94,23 +122,5 @@ bool Groups::Remove(long group_id)
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // namespace Winix
 

core/groups.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_groups
@@ -17,6 +42,10 @@
 #include "db/db.h"
 
 
+namespace Winix
+{
+
+
 
 class Groups
 {
@@ -45,8 +74,7 @@ public:
 
 
 
-
-
+} // namespace Winix
 
 
 

core/htmlfilter.cpp

@@ -1,16 +1,47 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include "htmlfilter.h"
 
 
 
+namespace Winix
+{
+
+
+
+
 void HTMLFilter::Item::Clear()
 {
 	name.clear();
@@ -193,6 +224,13 @@ void HTMLFilter::SafeMode(bool safe_mode_)
 }
 
 
+void HTMLFilter::SetNoFilterTag(const std::wstring & tag_name)
+{
+	no_filter_tag = tag_name;
+}
+
+
+
 
 HTMLFilter::Item & HTMLFilter::GetItem(size_t i)
 {
@@ -340,7 +378,6 @@ void HTMLFilter::PutLastTagWithClosingTag()
 {
 const wchar_t * start = pchar;
 
-
 	while( *pchar != 0 )
 	{
 		if( IsOpeningTagMark() )
@@ -362,6 +399,31 @@ const wchar_t * start = pchar;
 }
 
 
+// used with <nofilter> </nofilter> tags
+void HTMLFilter::PutTextBetweenLastTagWithClosingTag()
+{
+const wchar_t * start = pchar, * end = pchar;
+
+	while( *pchar != 0 )
+	{
+		if( IsOpeningTagMark() )
+		{
+			if( IsClosingTagForLastItem() )
+			{
+				PopStack();
+				CheckNewLine();
+				break;
+			}
+		}
+		else
+		{
+			pchar += 1;
+			end = pchar;
+		}
+	}
+
+	Put(start, end);
+}
 
 
 
@@ -444,16 +506,34 @@ void HTMLFilter::ReadItemAttrValue(bool has_quote)
 {
 size_t i;
 
+	// sprawdzic to wszedzie bo teraz jest tablica
 	attr_value.clear();
+	attr_value_temp.clear();
 
-	// !! moze dodac obsluge escepowania cudzyslowu? sprawdzic czy to jest dostepne w htmlu
-	for( i=0 ; *pchar && *pchar != '\"' && !IsClosingTagMark() && (has_quote || (*pchar!=10 && !IsWhite(*pchar)) ); ++i )
+	// !! dodac obsluge pojedynczego cudzyslowu
+
+	for(i=0 ; *pchar && *pchar != '\"' && !IsClosingTagMark() && (has_quote || (*pchar!=10 && !IsWhite(*pchar)) ); ++i )
 	{
+		if( *pchar==10 || IsWhite(*pchar) )
+		{
+			if( !attr_value_temp.empty() )
+			{
+				attr_value.push_back(attr_value_temp);
+				attr_value_temp.clear();
+			}
+		}
+		else
 		if( i < WINIX_HTMLFILTER_ATTR_VALUE_MAXLEN )
-			attr_value += *pchar;
+			attr_value_temp += *pchar;
 
 		++pchar;
 	}
+
+	if( !attr_value_temp.empty() )
+	{
+		attr_value.push_back(attr_value_temp);
+		attr_value_temp.clear();
+	}
 }
 
 
@@ -715,14 +795,22 @@ void HTMLFilter::PutClosingTagMark()
 
 
 
+// !! zmienic na lepsza nazwe
+// bo to nie zwraca true jesli tag jest safe
 bool HTMLFilter::IsTagSafe(const wchar_t * tag)
 {
 	if( !safe_mode )
 		return true;
 
+	if( IsNameEqual(tag, no_filter_tag.c_str()) )
+		return false;
+
 	static const wchar_t * unsafe_tags[] = {
-		L"script", L"iframe", L"frame", L"frameset",
-		L"applet", L"head", L"meta", L"html", L"link", L"body"
+		L"applet", 	L"base",	L"body",
+		L"embed",	L"head",	L"html",
+		L"frame",	L"frameset",L"iframe",
+		L"link",	L"meta",	L"param"
+		L"object",	L"script"
 	};
 
 	size_t len = sizeof(unsafe_tags) / sizeof(const wchar_t*);
@@ -750,7 +838,8 @@ bool HTMLFilter::IsTagSafe(const std::wstring & tag)
 bool HTMLFilter::PutOpeningTag()
 {
 	if( !IsTagSafe(LastItem().name) )
-		// dodac tutaj skipniecie calego tagu
+		// !! IMPROVE ME
+		// !! dodac tutaj skipniecie calego tagu
 		return false;
 
 	PutOpeningTagMark();
@@ -940,6 +1029,9 @@ const wchar_t * last_non_white = pchar;
 
 bool HTMLFilter::PrintOpeningItem()
 {
+	if( IsNameEqual(no_filter_tag, LastItem().name) )
+		return true;
+
 	if( last_new_line )
 	{
 		PutNewLine();
@@ -976,6 +1068,8 @@ bool HTMLFilter::ReadItemAttr()
 	pchar += 1;				// skipping '='
 	SkipWhiteLines();
 
+
+	// !! dodac obsluge pojedynczego cudzyslowu
 	bool has_quote = (*pchar == '\"');
 
 	if( has_quote )
@@ -996,28 +1090,46 @@ bool HTMLFilter::CheckItemAttr()
 	if( attr_has_value && IsNameEqual(L"lang", attr_name) )
 	{
 		LastItem().porphans = 0;
-		attr_value_lower = attr_value;
-		ToLower(attr_value_lower);
 
-		OrphansTab::iterator i = orphans_tab.find(attr_value_lower);
+		if( !attr_value.empty() )
+		{
+			// we are taking the first value only
+			attr_value_lower = attr_value[0];
+			ToLower(attr_value_lower);
 
-		if( i != orphans_tab.end()  )
-			LastItem().porphans = &i->second;
+			OrphansTab::iterator i = orphans_tab.find(attr_value_lower);
+
+			if( i != orphans_tab.end()  )
+				LastItem().porphans = &i->second;
+		}
 	}
 
 return true;
 }
 
 
-void HTMLFilter::PrinItemAttr()
+void HTMLFilter::PrintItemAttr()
 {
+size_t i;
+
+	if( IsNameEqual(no_filter_tag, LastItem().name) )
+		return;
+
 	Put(' ');
 	Put(attr_name);
 
 	if( attr_has_value )
 	{
 		Put(L"=\"");
-		Put(attr_value);
+
+		for(i=0 ; i<attr_value.size() ; ++i)
+		{
+			Put(attr_value[i]);
+
+			if( i + 1 < attr_value.size() )
+				Put(' ');
+		}
+
 		Put('\"');
 	}
 }
@@ -1059,15 +1171,18 @@ void HTMLFilter::ReadItemOpening()
 		while( ReadItemAttr() )
 		{
 			if( CheckItemAttr() )
-				PrinItemAttr();
+				PrintItemAttr();
 		}
 
 		SkipAndCheckClosingTag(); // here LastItem().type can be changed to 'simple'
 
-		if( LastItem().type == Item::simple )
-			Put(L" /");
+		if( !IsNameEqual(no_filter_tag, LastItem().name) )
+		{
+			if( LastItem().type == Item::simple )
+				Put(L" /");
 
-		PutClosingTagMark();
+			PutClosingTagMark();
+		}
 	}
 }
 
@@ -1191,6 +1306,11 @@ bool HTMLFilter::IsLastTag(const wchar_t * name)
 }
 
 
+bool HTMLFilter::IsLastTag(const std::wstring & name)
+{
+	return IsNameEqual(name, LastItem().name);
+}
+
 
 // checking exceptions for opening tags
 void HTMLFilter::CheckExceptions()
@@ -1217,6 +1337,9 @@ void HTMLFilter::CheckExceptions()
 	if( IsLastTag(L"pre") || IsLastTag(L"textarea") )
 		PutLastTagWithClosingTag();
 
+	if( IsLastTag(no_filter_tag) )
+		PutTextBetweenLastTagWithClosingTag();
+
 	if( IsLastTag(L"body") )
 		LastItem().has_body_tag = true;
 }
@@ -1397,4 +1520,5 @@ void HTMLFilter::Read()
 
 
 
+} // namespace Winix
 

core/htmlfilter.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #ifndef headerfile_winix_core_htmlfilter
@@ -16,6 +41,10 @@
 #include <algorithm>
 
 
+namespace Winix
+{
+
+
 
 
 // max length of a name of a html tag (with terminating null)
@@ -106,6 +135,11 @@ public:
 	void InsertTabs(size_t tabsize);
 
 
+	// set a name of a html tag which will be used as 'nofilter' tag
+	// elements between such tags are not filtered (similarly as in <pre> and <textarea>)
+	// these tags (opening and closing) will no be placed in the html output
+	void SetNoFilterTag(const std::wstring & tag_name);
+
 	// orphans are checked only in 'body' tag
 	void AssignOrphans(const wchar_t * lang_code,      const std::vector<std::wstring> & otab);
 	void AssignOrphans(const std::wstring & lang_code, const std::vector<std::wstring> & otab);
@@ -139,6 +173,9 @@ protected:
 	typedef std::map<std::wstring, Orphans> OrphansTab;
 	OrphansTab orphans_tab;
 
+	// html <nofilter> tag name
+	std::wstring no_filter_tag;
+
 
 	struct Item
 	{
@@ -169,6 +206,10 @@ protected:
 	};
 
 
+
+
+
+
 	/*
 		virtual methods
 	*/
@@ -219,6 +260,7 @@ protected:
 	bool IsNameEqual(const std::wstring & name1, const std::wstring & name2, size_t len);
 
 	bool IsLastTag(const wchar_t * name);
+	bool IsLastTag(const std::wstring & name);
 	bool IsTagSafe(const wchar_t * tag);
 	bool IsTagSafe(const std::wstring & tag);
 
@@ -250,7 +292,7 @@ protected:
 
 	bool ReadItemAttr();
 	bool CheckItemAttr();
-	void PrinItemAttr();
+	void PrintItemAttr();
 
 	void ReadItemClosing();
 	void ReadItemSpecial();
@@ -266,6 +308,7 @@ protected:
 	void PutNormalNonWhite(const wchar_t * & str, const wchar_t * end);
 	void PutNormalWhite(const wchar_t * & str, const wchar_t * end);
 	void PutLastTagWithClosingTag();
+	void PutTextBetweenLastTagWithClosingTag();
 	void PutTabs(size_t len);
 	void PutNonBreakingSpace();
 	void PutNewLine();
@@ -284,7 +327,8 @@ protected:
 	size_t tab_size;
 	OrphanMode orphan_mode;
 	std::wstring attr_name;
-	std::wstring attr_value;
+	std::vector<std::wstring> attr_value;
+	std::wstring attr_value_temp;
 	std::wstring attr_value_lower;
 	bool attr_has_value;
 	std::wstring lang_code_lower;
@@ -295,5 +339,8 @@ protected:
 
 
 
+} // namespace Winix
+
+
 
 #endif

core/httpsimpleparser.cpp

@@ -1,15 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "httpsimpleparser.h"
 
 
+namespace Winix
+{
+
+
+
+
 void HttpSimpleParser::ToLower(std::string & s)
 {
 std::string::iterator i;
@@ -223,13 +254,5 @@ void HttpSimpleParser::Parse()
 
 
 
-
-
-
-
-
-
-
-
-
+} // namespace Winix
 

core/httpsimpleparser.h

@@ -1,19 +1,47 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_httpsimpleparser
 #define headerfile_winix_core_httpsimpleparser
 
-
 #include <string>
 
 
+namespace Winix
+{
+
+
 
 class HttpSimpleParser
 {
@@ -65,4 +93,7 @@ public:
 
 
 
+} // namespace Winix
+
+
 #endif

core/image.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <ctime>
@@ -13,6 +38,12 @@
 #include "log.h"
 #include "system.h"
 #include "plugin.h"
+#include "lock.h"
+
+
+
+namespace Winix
+{
 
 
 
@@ -35,15 +66,91 @@ void Image::SetSystem(System * psystem)
 }
 
 
+
 // first thread (objects locked)
-void Image::Resize(const Item & item, size_t cx, size_t cy, int aspect_mode, int quality)
+Image::Scale Image::GetImageScale(long dir_id)
 {
-	item_temp.type        = WINIX_IMAGE_TYPE_RESIZE;
-	item_temp.file        = item;
-	item_temp.cx          = cx;
-	item_temp.cy          = cy;
-	item_temp.aspect_mode = aspect_mode;
-	item_temp.quality     = quality;
+Scale scale;
+
+	Mount * m 	= system->mounts.CalcMount(dir_id);
+	scale.cx	= config->image_cx;
+	scale.cy	= config->image_cy;
+	scale.aspect_mode	= config->image_mode;
+	scale.quality		= config->image_quality;
+
+	// reading width and height from the mount point (if exists)
+	int index = system->mounts.MountParImageSize();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 2 )
+	{
+		scale.cx = Tol(m->param[index].arg[0]);
+		scale.cy = Tol(m->param[index].arg[1]);
+	}
+
+	// reading image mode from the mount point (if exists)
+	index = system->mounts.MountParImageMode();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 1 )
+		scale.aspect_mode = Toi(m->param[index].arg[0]);
+
+	// reading image quality from the mount point (if exists)
+	index = system->mounts.MountParImageQuality();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 1 )
+		scale.quality = Toi(m->param[index].arg[0]);
+
+return scale;
+}
+
+
+
+// first thread (objects locked)
+Image::Scale Image::GetThumbScale(long dir_id)
+{
+Scale scale;
+
+	Mount * m	= system->mounts.CalcMount(dir_id);
+	scale.cx	= config->thumb_cx;
+	scale.cy	= config->thumb_cy;
+	scale.aspect_mode	= config->thumb_mode;
+	scale.quality		= config->thumb_quality;
+
+	// reading width and height from the mount point (if exists)
+	int index = system->mounts.MountParThumbSize();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 2 )
+	{
+		scale.cx = Tol(m->param[index].arg[0]);
+		scale.cy = Tol(m->param[index].arg[1]);
+	}
+
+	// reading thumb mode from the mount point (if exists)
+	index = system->mounts.MountParThumbMode();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 1 )
+		scale.aspect_mode = Toi(m->param[index].arg[0]);
+
+	// reading image quality from the mount point (if exists)
+	index = system->mounts.MountParThumbQuality();
+
+	if( m && m->param[index].defined && m->param[index].arg.size() == 1 )
+		scale.quality = Toi(m->param[index].arg[0]);
+
+return scale;
+}
+
+
+
+
+// first thread (objects locked)
+void Image::Resize(long file_id, size_t cx, size_t cy, int aspect_mode, int quality)
+{
+	item_temp.type			= WINIX_IMAGE_TYPE_RESIZE;
+	item_temp.file_id		= file_id;
+	item_temp.cx			= cx;
+	item_temp.cy			= cy;
+	item_temp.aspect_mode	= aspect_mode;
+	item_temp.quality		= quality;
 
 	CheckParam(item_temp);
 	image_tab.insert(image_tab.end(), item_temp);
@@ -51,15 +158,16 @@ void Image::Resize(const Item & item, size_t cx, size_t cy, int aspect_mode, int
 }
 
 
+
 // first thread (objects locked)
-void Image::CreateThumb(const Item & item, size_t cx, size_t cy, int aspect_mode, int quality)
+void Image::CreateThumb(long file_id, size_t thumb_cx, size_t thumb_cy, int aspect_mode, int quality)
 {
-	item_temp.type        = WINIX_IMAGE_TYPE_CREATE_THUMB;
-	item_temp.file        = item;
-	item_temp.cx          = cx;
-	item_temp.cy          = cy;
-	item_temp.aspect_mode = aspect_mode;
-	item_temp.quality     = quality;
+	item_temp.type			= WINIX_IMAGE_TYPE_CREATE_THUMB;
+	item_temp.file_id		= file_id;
+	item_temp.thumb_cx		= thumb_cx;
+	item_temp.thumb_cy		= thumb_cy;
+	item_temp.aspect_mode	= aspect_mode;
+	item_temp.quality		= quality;
 
 	CheckParam(item_temp);
 	image_tab.insert(image_tab.end(), item_temp);
@@ -68,31 +176,75 @@ void Image::CreateThumb(const Item & item, size_t cx, size_t cy, int aspect_mode
 
 
 
+// first thread (objects locked)
+void Image::Crop(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy, int quality)
+{
+	item_temp.type			= WINIX_IMAGE_TYPE_CROP;
+	item_temp.file_id		= file_id;
+	item_temp.xoffset		= xoffset;
+	item_temp.yoffset		= yoffset;
+	item_temp.cx			= cx;
+	item_temp.cy			= cy;
+	item_temp.quality		= quality;
+
+	CheckParam(item_temp);
+	image_tab.insert(image_tab.end(), item_temp);
+	WakeUpThread();
+}
+
+
+
+// first thread (objects locked)
+void Image::CropThumb(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy, int quality)
+{
+	item_temp.type			= WINIX_IMAGE_TYPE_CROP_THUMB;
+	item_temp.file_id		= file_id;
+	item_temp.xoffset		= xoffset;
+	item_temp.yoffset		= yoffset;
+	item_temp.cx			= cx;
+	item_temp.cy			= cy;
+	item_temp.quality		= quality;
+
+	CheckParam(item_temp);
+	image_tab.insert(image_tab.end(), item_temp);
+	WakeUpThread();
+}
+
+
+
+// first thread (objects locked)
+void Image::CropNewThumb(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy,
+						 size_t thumb_cx, size_t thumb_cy, int aspect_mode, int quality)
+{
+	item_temp.type			= WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB;
+	item_temp.file_id		= file_id;
+	item_temp.xoffset		= xoffset;
+	item_temp.yoffset		= yoffset;
+	item_temp.cx			= cx;
+	item_temp.cy			= cy;
+	item_temp.thumb_cx		= thumb_cx;
+	item_temp.thumb_cy		= thumb_cy;
+	item_temp.aspect_mode	= aspect_mode;
+	item_temp.quality		= quality;
+
+	CheckParam(item_temp);
+	image_tab.insert(image_tab.end(), item_temp);
+	WakeUpThread();
+}
+
+
+
+
 void Image::CheckParam(ImageItem & item)
 {
-	if( item.aspect_mode < 1 )
-		item.aspect_mode = 1;
-
-	if( item.aspect_mode > 7 )
-		item.aspect_mode = 7;
-
-	if( item.quality < 0 )
-		item.quality = 0;
-
-	if( item.quality > 100 )
-		item.quality = 100;
-
-	if( item_temp.cx < 5 )
-		item_temp.cx = 5;
-
-	if( item_temp.cy < 5 )
-		item_temp.cy = 5;
-
-	if( item_temp.cx > 10000 )
-		item_temp.cx = 10000;
-
-	if( item_temp.cy > 10000 )
-		item_temp.cy = 10000;
+	SetMinMax(item.aspect_mode, 	1, 7);
+	SetMinMax(item.quality, 		0, 100);
+	SetMinMax(item.cx, 				1, 30000);
+	SetMinMax(item.cy, 				1, 30000);
+	SetMinMax(item.thumb_cx,		1, 30000);
+	SetMinMax(item.thumb_cy,		1, 30000);
+	SetMinMax(item.xoffset, 		0, 30000);
+	SetMinMax(item.yoffset, 		0, 30000);
 }
 
 
@@ -117,7 +269,7 @@ bool end;
 
 	do
 	{
-		Lock();
+		class Lock lock_object(synchro);
 		
 		if( i != image_tab.end() )
 		{
@@ -130,7 +282,7 @@ bool end;
 			end = true;
 		}
 
-		Unlock();
+		lock_object.Unlock();
 
 		if( !end )
 			CreateImage();
@@ -163,7 +315,8 @@ void Image::EscapePath(const std::string & path, TextStream<std::string> & out,
 		if( path[i] == '"' )
 			out << '\\';
 
-		out << path[i];
+		if( path[i] != 0 )
+			out << path[i];
 	}
 
 	out << '\"';
@@ -184,37 +337,37 @@ widthxheight! 		Width and height emphatically given, original aspect ratio ignor
 widthxheight> 		Change as per widthxheight but only if an image dimension exceeds a specified dimension.
 widthxheight< 		Change dimensions only if both image dimensions exceed specified dimensions.
 */
-void Image::SelectAspect()
+void Image::SelectAspect(size_t cx, size_t cy)
 {
 	switch( item_work.aspect_mode )
 	{
 	case WINIX_IMAGE_MODE_1:
-		command << item_work.cx;
+		command << cx;
 		break;
 
 	case WINIX_IMAGE_MODE_3:
-		command << item_work.cx << "x" << item_work.cy;
+		command << cx << "x" << cy;
 		break;
 
 	case WINIX_IMAGE_MODE_4:
-		command << '"' << item_work.cx << "x" << item_work.cy << "^\"";
+		command << '"' << cx << "x" << cy << "^\"";
 		break;
 
 	case WINIX_IMAGE_MODE_5:
-		command << '"' << item_work.cx << "x" << item_work.cy << "!\"";
+		command << '"' << cx << "x" << cy << "!\"";
 		break;
 
 	case WINIX_IMAGE_MODE_6:
-		command << '"' << item_work.cx << "x" << item_work.cy << ">\"";
+		command << '"' << cx << "x" << cy << ">\"";
 		break;
 
 	case WINIX_IMAGE_MODE_7:
-		command << '"' << item_work.cx << "x" << item_work.cy << "<\"";
+		command << '"' << cx << "x" << cy << "<\"";
 		break;
 
 	case WINIX_IMAGE_MODE_2:
 	default:
-		command << "x" << item_work.cy;
+		command << "x" << cy;
 		break;
 	}
 }
@@ -224,7 +377,17 @@ void Image::SelectAspect()
 // second thread (objects locked)
 bool Image::CreateInputFileName()
 {
-	if( system->MakeFilePath(item_work.file, src_path) )
+	bool thumb = (item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB);
+
+	if( thumb && !file_work.has_thumb )
+	{
+		log << log1 << "Image: file id: " << file_work.id << ", url: " << file_work.url
+			<< " doesn't have a thumbnail yet (skipping)" << logend;
+
+		return false;
+	}
+
+	if( system->MakeFilePath(file_work, src_path, thumb) )
 	{
 		PT::WideToUTF8(src_path, input_file_name);
 		return true;
@@ -237,6 +400,7 @@ bool Image::CreateInputFileName()
 }
 
 
+
 // second thread (objects locked)
 void Image::CreateTmpFileName()
 {
@@ -250,26 +414,17 @@ void Image::CreateTmpFileName()
 // second thread (objects are not locked)
 bool Image::CreateCommand()
 {
-	Lock();
+	class Lock lock_object(synchro);
 
 	iq.SetAll(true, false);
-	iq.WhereId(item_work.file.id);
-
-	// !! skoro teraz i tak wczytujemy caly obiekt
-	// to teraz w kolejce wystarczy zapamietywac tylko samo item.id (a nie caly obiekt item)
+	iq.WhereId(item_work.file_id);
 
 	// the file could have been changed especially when there is a long queue of files
-	if( db->GetItem(item_work.file, iq) != WINIX_ERR_OK )
-	{
-		Unlock();
+	if( db->GetItem(file_work, iq) != WINIX_ERR_OK )
 		return false;
-	}
 
 	if( !CreateInputFileName() )
-	{
-		Unlock();
 		return false;
-	}
 
 	command.Clear();
 	Add(config->convert_cmd, command);
@@ -279,11 +434,38 @@ bool Image::CreateCommand()
 	command << " -quiet -quality " << item_work.quality;
 		
 	if( item_work.type == WINIX_IMAGE_TYPE_RESIZE )
+	{
 		command << " -resize ";
+		SelectAspect(item_work.cx, item_work.cy);
+	}
 	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB )
+	{
 		command << " -strip -thumbnail ";
+		SelectAspect(item_work.thumb_cx, item_work.thumb_cy);
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CROP )
+	{
+		command << " -crop " << item_work.cx << "x" << item_work.cy
+				<< "+" << item_work.xoffset << "+" << item_work.yoffset << " +repage ";
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB )
+	{
+		command << " -strip -crop " << item_work.cx << "x" << item_work.cy
+				<< "+" << item_work.xoffset << "+" << item_work.yoffset
+				<< " +repage ";
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB )
+	{
+		command << " -strip -crop " << item_work.cx << "x" << item_work.cy
+				<< "+" << item_work.xoffset << "+" << item_work.yoffset
+				<< " +repage -thumbnail ";
+		SelectAspect(item_work.thumb_cx, item_work.thumb_cy);
+	}
 
-	SelectAspect();
 	CreateTmpFileName();
 
 	command << " ";
@@ -291,7 +473,6 @@ bool Image::CreateCommand()
 
 	log << log4 << "Image: running: " << command.Str() << logend;
 
-	Unlock();
 
 return true;
 }
@@ -299,43 +480,83 @@ return true;
 
 
 
+// second thread (objects are locked)
+void Image::ImageSavedCorrectly()
+{
+	if( item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB )
+	{
+		if( !file_work.has_thumb )
+		{
+			file_work.has_thumb = true;
+			db->EditHasThumbById(true, file_work.id);
+		}
+
+		log << log3 << "Image: generated a thumbnail: " << dst_path << logend;
+		plugin.Call((Session*)0, WINIX_CREATED_THUMB, &file_work);
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_RESIZE )
+	{
+		log << log3 << "Image: image resized: " << dst_path << logend;
+		plugin.Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work);
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CROP )
+	{
+		log << log3 << "Image: image cropped: " << dst_path << logend;
+		// !! IMPROVE ME add a correct message
+		//plugin.Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work);
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB )
+	{
+		log << log3 << "Image: image thumbnail cropped: " << dst_path << logend;
+		// !! IMPROVE ME add a correct message
+		//plugin.Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work);
+	}
+	else
+	if( item_work.type == WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB )
+	{
+		log << log3 << "Image: a new thumbnail from an original image was cropped: " << dst_path << logend;
+		// !! IMPROVE ME add a correct message
+		//plugin.Call((Session*)0, WINIX_IMAGE_RESIZED, &file_work);
+	}
+}
+
+
 // second thread (objects are not locked)
 void Image::SaveImage()
 {
-bool moved = false;
-
-	Lock();
+	class Lock lock_object(synchro);
 
 	// the file could have been changed especially when creating the image lasted too long
 	iq.SetAll(true, false);
-	iq.WhereId(item_work.file.id);
+	iq.WhereId(item_work.file_id);
 
-	if( db->GetItem(item_work.file, iq) == WINIX_ERR_OK )
+	if( db->GetItem(file_work, iq) == WINIX_ERR_OK )
 	{
-		bool thumb = (item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB);
+		bool thumb = (item_work.type == WINIX_IMAGE_TYPE_CREATE_THUMB 	||
+					  item_work.type == WINIX_IMAGE_TYPE_CROP_THUMB 	||
+					  item_work.type == WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB );
 
-		if( system->MakeFilePath(item_work.file, dst_path, thumb, true, config->upload_dirs_chmod) )
+		if( system->MakeFilePath(file_work, dst_path, thumb, true, config->upload_dirs_chmod, config->upload_group_int) )
 		{
 			if( RenameFile(stream_tmp_path.Str(), dst_path) )
 			{
-				if( thumb )
-				{
-					item_work.file.has_thumb = true;
-					db->EditHasThumbById(true, item_work.file.id);
-					log << log3 << "Image: generated a thumbnail: " << dst_path << logend;
-					plugin.Call((Session*)0, WINIX_CREATED_THUMB, &item_work.file);
-				}
-				else
-				{
-					log << log3 << "Image: image resized: " << dst_path << logend;
-					plugin.Call((Session*)0, WINIX_IMAGE_RESIZED, &item_work.file);
-				}
+				// it doesn't matter for us if there is an error when chmod/chown on a file
+				// the admin (root) will correct it
+				std::string dst_patha; // IMPROVE ME temporary -- in the futere there'll be SetPriv() with std::wstring
+				PT::WideToUTF8(dst_path, dst_patha);
+				SetPriv(dst_patha, config->upload_files_chmod, config->upload_group_int);
 
-				moved = true;
+				ImageSavedCorrectly();
 			}
 			else
 			{
-				log << log1 << "Image: cannot move a temporary file: " << stream_tmp_path.Str() << ", to: " << dst_path << logend;
+				log << log1 << "Image: cannot move a temporary file: " << stream_tmp_path.Str()
+					<< ", to: " << dst_path << logend;
+
+				Winix::RemoveFile(stream_tmp_path.Str());
 			}
 		}
 		else
@@ -343,11 +564,6 @@ bool moved = false;
 			log << log1 << "Image: cannot create a destination path" << logend;
 		}
 	}
-
-	if( !moved )
-		::RemoveFile(stream_tmp_path.Str());
-
-	Unlock();
 }
 
 
@@ -355,21 +571,20 @@ bool moved = false;
 // second thread (objects are not locked)
 void Image::CreateImage()
 {
-	if( !CreateCommand() )
-		return;
-
-	int res = std::system(command.CStr());
-
-	if( res == 0 )
+	if( CreateCommand() )
 	{
-		SaveImage();
-	}
-	else
-	{
-		Lock();
-		log << log3 << "Image: some problems with creating an image" 
-			<< ", 'convert' process returned: " << res << logend;
-		Unlock();
+		int res = std::system(command.CStr());
+
+		if( res == 0 )
+		{
+			SaveImage();
+		}
+		else
+		{
+			class Lock lock_object(synchro);
+			log << log3 << "Image: some problems with creating an image"
+				<< ", 'convert' process returned: " << res << logend;
+		}
 	}
 }
 
@@ -413,3 +628,7 @@ void Image::CreateThumbnail()
 */
 
 
+
+
+} // namespace Winix
+

core/image.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_image
@@ -19,10 +44,15 @@
 #include "core/config.h"
 
 
+namespace Winix
+{
+
+
+
 class System;
 
 
-
+// aspect modes:
 // Width given, height automagically selected to preserve aspect ratio.
 #define WINIX_IMAGE_MODE_1	1
 
@@ -45,25 +75,74 @@ class System;
 #define WINIX_IMAGE_MODE_7	7
 
 
+
+
 // resizing
 #define WINIX_IMAGE_TYPE_RESIZE			1
 
 // generating a thumbnail
 #define WINIX_IMAGE_TYPE_CREATE_THUMB	2
 
+// cropping an image
+#define WINIX_IMAGE_TYPE_CROP			3
+
+// cropping an thumbnail
+#define WINIX_IMAGE_TYPE_CROP_THUMB		4
+
+// creating by cropping a new thumbnail (from an original image)
+#define WINIX_IMAGE_TYPE_CREATE_CROP_NEW_THUMB	5
 
 
+/*
 
+*/
 class Image : public BaseThread
 {
 public:
 
+	struct Scale
+	{
+		size_t cx;
+		size_t cy;
+		int aspect_mode;
+		int quality;
+
+		Scale()
+		{
+			cx = cy = 1;
+			aspect_mode = 2;
+			quality = 100;
+		};
+	};
+
+
 	void SetDb(Db * pdb);
 	void SetConfig(Config * pconfig);
 	void SetSystem(System * psystem);
 
-	void Resize(const Item & item, size_t cx, size_t cy, int aspect_mode, int quality);
-	void CreateThumb(const Item & item, size_t cx, size_t cy, int aspect_mode, int quality);
+
+	// returning scale info for a directory
+	Scale GetImageScale(long dir_id);
+
+	// returning scale info (for thumbnails) for a directory
+	Scale GetThumbScale(long dir_id);
+
+
+
+	void Resize(long file_id, size_t cx, size_t cy, int aspect_mode, int quality);
+
+	// creating a new thumbnail from an original image
+	void CreateThumb(long file_id, size_t thumb_cx, size_t thumb_cy, int aspect_mode, int quality);
+
+	// cropping an image (the thumbnail is not changed)
+	void Crop(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy, int quality);
+
+	// cropping an existing thumbnail
+	void CropThumb(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy, int quality);
+
+	// creating and cropping a new thumbnail (from an original image)
+	void CropNewThumb(long file_id, size_t xoffset, size_t yoffset, size_t cx, size_t cy,
+					  size_t thumb_cx, size_t thumb_cy, int aspect_mode, int quality);
 
 
 private:
@@ -75,13 +154,29 @@ private:
 	struct ImageItem
 	{
 		int type;		// WINIX_IMAGE_TYPE_*
-		Item file;
+		long file_id;
 		size_t cx;
 		size_t cy;
+		size_t xoffset;	// xoffset and yoffset are used when cropping
+		size_t yoffset;
+		size_t thumb_cx;
+		size_t thumb_cy;
 		int aspect_mode;
 		int quality;
 	};
 
+
+	template<typename int_type>
+	void SetMinMax(int_type & var, int var_min, int var_max)
+	{
+		if( static_cast<int>(var) < var_min )
+			var = var_min;
+
+		if( static_cast<int>(var) > var_max )
+			var = var_max;
+	}
+
+
 	// queue of thumbnails to create
 	typedef std::list<ImageItem> ImageTab;
 	ImageTab image_tab;
@@ -96,6 +191,7 @@ private:
 	std::string add_tempa;
 	std::string input_file_name;
 	std::string tmp_file_name;
+	Item file_work;
 
 	virtual bool SignalReceived();
 	virtual void Do();
@@ -104,11 +200,16 @@ private:
 	void CreateTmpFileName();
 	void SaveImage();
 	void CreateImage();
-	void SelectAspect();
+	void SelectAspect(size_t cx, size_t cy);
 	void EscapePath(const std::string & path, TextStream<std::string> & out, bool clear_stream = true);
 	void CheckParam(ImageItem & item);
 	void Add(const std::wstring & in, TextStream<std::string> & out);
+	void ImageSavedCorrectly();
+
 };
 
 
+} // namespace Winix
+
+
 #endif

core/ipban.h

@@ -1,15 +1,48 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #ifndef headerfile_winix_core_ipban
 #define headerfile_winix_core_ipban
 
+#include <ctime>
+
+
+namespace Winix
+{
+
+
+
 
 // telling if the IPBan record is active
 // we have two records: active and non active
@@ -145,4 +178,8 @@ struct IPBan
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/ipbancontainer.cpp

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -13,6 +38,10 @@
 #include "date/date.h"
 
 
+namespace Winix
+{
+
+
 
 IPBanContainer::IPBanContainer()
 {
@@ -216,6 +245,9 @@ bool IPBanContainer::SortIPBansFunction(const IPBan & ip1, const IPBan & ip2)
 
 
 
+} // namespace Winix
+
+
 
 
 

core/ipbancontainer.h

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -14,6 +39,10 @@
 #include "ipban.h"
 
 
+namespace Winix
+{
+
+
 
 class IPBanContainer
 {
@@ -54,5 +83,8 @@ private:
 };
 
 
+} // namespace Winix
+
+
 #endif
 

core/item.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "item.h"
@@ -12,6 +37,11 @@
 #include "crypt.h"
 
 
+namespace Winix
+{
+
+
+
 
 Item::Item()
 {
@@ -80,3 +110,6 @@ void Item::Clear()
 }
 
 
+
+} // namespace Winix
+

core/item.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_item
@@ -15,6 +40,9 @@
 #include "date/date.h"
 
 
+namespace Winix
+{
+
 
 #define WINIX_ITEM_FILETYPE_NONE		0
 #define WINIX_ITEM_FILETYPE_IMAGE		1
@@ -76,7 +104,7 @@ struct Item
 
 	// used when type is symlink or to a directory too (function 'default')
 	std::wstring link_to;
-	int link_redirect;
+	int link_redirect; // !! IMPROVE ME should it be 'bool'?
 
 
 	// static file (if exists)
@@ -118,5 +146,8 @@ friend struct DbItemColumns;
 };
 
 
+} // namespace Winix
+
+
 
 #endif

core/job.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "job.h"
@@ -12,6 +37,11 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
+
 
 Job::Job()
 {
@@ -162,4 +192,7 @@ void Job::DoWinixJob(PT::Space & job)
 
 
 
+} // namespace Winix
+
+
 

core/job.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_jobs
@@ -16,6 +41,10 @@
 #include "space/space.h"
 
 
+namespace Winix
+{
+
+
 
 #define WINIX_JOBS_HOW_MANY_PRIORITIES	32
 
@@ -78,5 +107,9 @@ private:
 
 };
 
+
+} // namespace Winix
+
+
 #endif
 

core/lastcontainer.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 
@@ -13,6 +38,12 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
+
+
 LastItem::LastItem()
 {
 	user_id    = 0;
@@ -106,3 +137,8 @@ LastTab::iterator i = FindNotLoggedOut(user_id, session_id);
 			<< user_id << " ses_id: " << session_id << logend;
 	}
 }
+
+
+
+} // namespace Winix
+

core/lastcontainer.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_lastcontainer
@@ -18,6 +43,11 @@
 
 
 
+namespace Winix
+{
+
+
+
 // how many items we store in the 'last' function
 #define WINIX_LASTCONTAINER_TABLE_SIZE 100
 
@@ -75,4 +105,8 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/loadavg.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 
@@ -12,6 +37,10 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
 
 LoadAvg::LoadAvg()
 {
@@ -370,3 +399,8 @@ double LoadAvg::ReqPerSec15()
 
 return cache_req_per_sec15;
 }
+
+
+
+} // namespace Winix
+

core/loadavg.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_loadavg
@@ -13,6 +38,10 @@
 #include <ctime>
 
 
+namespace Winix
+{
+
+
 
 
 // in seconds
@@ -110,5 +139,8 @@ private:
 
 
 
+} // namespace Winix
+
+
 
 #endif

core/lock.cpp

@@ -1,15 +1,45 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "lock.h"
 
 
+namespace Winix
+{
+
+
+
 
 Lock::Lock()
 {
@@ -47,3 +77,6 @@ void Lock::Unlock()
 }
 
 
+
+} // namespace Winix
+

core/lock.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_lock
@@ -13,6 +38,11 @@
 #include "synchro.h"
 
 
+namespace Winix
+{
+
+
+
 class Lock
 {
 public:
@@ -34,4 +64,8 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/log.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "log.h"
@@ -14,6 +39,11 @@
 #include "timezones.h"
 
 
+namespace Winix
+{
+
+
+
 Log::Log()
 {
 	log_level     = 1;
@@ -453,28 +483,5 @@ void Log::SaveLog()
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // namespace Winix
 

core/log.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_log
@@ -20,6 +45,11 @@
 #include "textstream/textstream.h"
 
 
+namespace Winix
+{
+
+
+
 class TimeZones;
 
 
@@ -155,6 +185,12 @@ return *this;
 extern Log log;
 extern Log nlog;
 
+
+} // namespace Winix
+
+
+
+
 // for convenience, we have to use only #include "log.h" in the winix
 #include "slog.h"
 

core/logmanipulators.h

@@ -1,16 +1,47 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_logmanipulators
 #define headerfile_winix_core_logmanipulators
 
 
+namespace Winix
+{
+
+
+
+
 /*
 	log1 - the first level
 	log2
@@ -44,5 +75,9 @@ enum LogManipulators
 };
 
 
+
+} // namespace Winix
+
+
 #endif
 

core/misc.cpp

@@ -1,20 +1,52 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <grp.h>
 #include <fstream>
+#include <cstdlib>
 #include "misc.h"
 #include "log.h"
 #include "templates/templates.h"
 
 
+namespace Winix
+{
+
+
+
 
 namespace misc_private
 {
@@ -77,6 +109,34 @@ long Tol(const wchar_t * str, int base)
 
 
 
+double Tod(const std::string & str)
+{
+	return strtod(str.c_str(), 0);
+}
+
+
+double Tod(const std::wstring & str)
+{
+	return wcstold(str.c_str(), 0);
+}
+
+
+double Tod(const char * str)
+{
+	return strtod(str, 0);
+}
+
+
+double Tod(const wchar_t * str)
+{
+	return wcstold(str, 0);
+}
+
+
+
+
+
+
 
 const wchar_t * Toa(unsigned int value,  int base)
 {
@@ -746,7 +806,10 @@ bool IsFile(const std::wstring & file)
 }
 
 
-bool CreateDir(const wchar_t * dir, int priv)
+/*
+ * group can be -1 (it is not used then)
+ */
+bool CreateDir(const wchar_t * dir, int priv, int group)
 {
 static std::string adir;
 
@@ -754,27 +817,29 @@ static std::string adir;
 	{
 		PT::WideToUTF8(dir, adir);
 
-		if( mkdir(adir.c_str(), priv) < 0 )
+		if( mkdir(adir.c_str(), 0777) < 0 )
 		{
 			log << log1 << "Can't create a directory on fs: " << adir << logend;
 			return false;
 		}
+
+		return SetPriv(adir, priv, group);
 	}
 
 return true;
 }
 
 
-bool CreateDir(const std::wstring & dir, int priv)
+bool CreateDir(const std::wstring & dir, int priv, int group)
 {
-	return CreateDir(dir.c_str(), priv);
+	return CreateDir(dir.c_str(), priv, group);
 }
 
 
 
 // creating directories (can be more than one)
 // 'dirs' can begin with a slash (will be skipped)
-bool CreateDirs(const wchar_t * base_dir, const wchar_t * dirs, int priv, bool skip_last)
+bool CreateDirs(const wchar_t * base_dir, const wchar_t * dirs, int priv, int group, bool skip_last)
 {
 static std::wstring temp;
 const wchar_t * p = dirs;
@@ -800,7 +865,7 @@ const wchar_t * p = dirs;
 			temp += *p;
 
 		if( !skip_last || *p!=0 )
-			if( !CreateDir(temp.c_str(), priv) )
+			if( !CreateDir(temp.c_str(), priv, group) )
 				return false;
 
 		temp += '/';
@@ -811,9 +876,72 @@ return true;
 
 
 
-bool CreateDirs(const std::wstring & base_dir, const std::wstring & dirs, int priv, bool skip_last)
+bool CreateDirs(const std::wstring & base_dir, const std::wstring & dirs, int priv, int group, bool skip_last)
 {
-	return CreateDirs(base_dir.c_str(), dirs.c_str(), priv, skip_last);
+	return CreateDirs(base_dir.c_str(), dirs.c_str(), priv, group, skip_last);
+}
+
+
+
+int GetGroupId(const char * name)
+{
+struct group gr;
+struct group * result;
+char buffer[512];
+
+	if( getgrnam_r(name, &gr, buffer, sizeof(buffer)/sizeof(char), &result) != 0 )
+	{
+		log << log1 << "I cannot get the group_id for group name: " << name << logend;
+		return -1;
+	}
+
+	/*
+	 * there is no such a group in /etc/group
+	 */
+	if( result == 0 )
+	{
+		log << log1 << "There is no a group with name: " << name << logend;
+		return -1;
+	}
+
+return gr.gr_gid;
+}
+
+
+int GetGroupId(const std::string & name)
+{
+	return GetGroupId(name.c_str());
+}
+
+
+/*
+ * setting priveleges and a group id on a file or on a directory
+ * group can be -1 (it is not used then)
+ */
+bool SetPriv(const char * name, int priv, int group)
+{
+	if( chmod(name, priv) < 0 )
+	{
+		log << log1 << "Can't set proper fs privileges on: " << name << logend;
+		return false;
+	}
+
+	if( group != -1 )
+	{
+		if( chown(name, geteuid(), group) < 0 )
+		{
+			log << log1 << "Can't set proper fs group on: " << name << logend;
+			return false;
+		}
+	}
+
+return true;
+}
+
+
+bool SetPriv(const std::string & name, int priv, int group)
+{
+	return SetPriv(name.c_str(), priv, group);
 }
 
 
@@ -1127,3 +1255,6 @@ void RemovePostFileTmp(PostFileTab & post_file_tab)
 
 
 
+
+} // namespace Winix
+

core/misc.h

@@ -1,16 +1,40 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_misc
 #define headerfile_winix_core_misc
 
-
 #include <string>
 #include <sstream>
 #include <ctime>
@@ -22,6 +46,10 @@
 #include "utf8/utf8.h"
 
 
+namespace Winix
+{
+
+
 
 
 /*
@@ -38,6 +66,11 @@ long Tol(const std::wstring & str, int base = 10);
 long Tol(const char * str,         int base = 10);
 long Tol(const wchar_t * str,      int base = 10);
 
+double Tod(const std::string & str);
+double Tod(const std::wstring & str);
+double Tod(const char * str);
+double Tod(const wchar_t * str);
+
 
 // if the buffer is too small it will be terminated at the beginning (empty string)
 // and the function returns false
@@ -272,7 +305,24 @@ typename StringType::size_type i;
 
 
 template<class StringType>
-void Trim(StringType & s, wchar_t c)
+void TrimFirst(StringType & s, wchar_t c)
+{
+typename StringType::size_type i;
+
+	if( s.empty() )
+		return;
+
+	// looking for the 'c' characters at the beginning
+	for(i=0 ; i<s.size() && s[i]==c ; ++i);
+
+	// deleting the 'c' characters at the beginning
+	if( i != 0 )
+		s.erase(0, i);
+}
+
+
+template<class StringType>
+void TrimLast(StringType & s, wchar_t c)
 {
 typename StringType::size_type i;
 	
@@ -292,16 +342,23 @@ typename StringType::size_type i;
 	// deleting 'c' characters at the end
 	if( i != s.size() - 1 )
 		s.erase(i+1, StringType::npos);
-	
-	// looking for the 'c' characters at the beginning
-	for(i=0 ; i<s.size() && s[i]==c ; ++i);
-	
-	// deleting the 'c' characters at the beginning
-	if( i != 0 )
-		s.erase(0, i);
 }
 
 
+
+template<class StringType>
+void Trim(StringType & s, wchar_t c)
+{
+	if( s.empty() )
+		return;
+	
+	TrimLast(s, c);
+	TrimFirst(s, c);
+}
+
+
+
+
 template<class StringType>
 void MaxSize(StringType & str, size_t max_size)
 {
@@ -691,13 +748,19 @@ bool ValidateEmail(const std::wstring & email);
 
 bool IsFile(const wchar_t * file);
 bool IsFile(const std::wstring & file);
-bool CreateDir(const wchar_t * dir, int priv);
-bool CreateDir(const std::wstring & dir, int priv);
+bool CreateDir(const wchar_t * dir, int priv, int group = -1);
+bool CreateDir(const std::wstring & dir, int priv, int group = -1);
 
 // creating directories (dirs) under base_dir (base_dir must exist)
 // if skip_last == true then last part from dir is treated as a file (the last directory is not created)
-bool CreateDirs(const wchar_t * base_dir, const wchar_t * dirs, int priv = 0755, bool skip_last = false);
-bool CreateDirs(const std::wstring & base_dir, const std::wstring & dirs, int priv = 0755, bool skip_last = false);
+bool CreateDirs(const wchar_t * base_dir, const wchar_t * dirs, int priv = 0755, int group = -1, bool skip_last = false);
+bool CreateDirs(const std::wstring & base_dir, const std::wstring & dirs, int priv = 0755, int group = -1, bool skip_last = false);
+
+int GetGroupId(const char * name);
+int GetGroupId(const std::string & name);
+
+bool SetPriv(const char * name, int priv, int group = -1);
+bool SetPriv(const std::string & name, int priv, int group = -1);
 
 bool CopyFile(FILE * in, FILE * out);
 bool CopyFile(const wchar_t * src, const wchar_t * dst);
@@ -971,4 +1034,49 @@ size_t i1, i2;
 
 
 
+
+template<typename IntType>
+void SetMinMax(IntType & val, IntType min_val, IntType max_val)
+{
+	if( val < min_val )
+		val = min_val;
+
+	if( val > max_val )
+		val = max_val;
+}
+
+
+
+
+
+template<class Stream, class StringType>
+void JSONescape(Stream & out, const StringType & str)
+{
+	// !! IMPROVE ME (optimizing)
+	// it is better to not write one by one character
+	// but use write method insted
+
+	for(size_t i=0 ; i<str.size() ; ++i)
+	{
+		switch(str[i])
+		{
+		case 0:		out << '\\';	out << '0';		break;
+		case '\r':	out << '\\';	out << 'r';		break;
+		case '\n':	out << '\\';	out << 'n';		break;
+		case '\t':	out << '\\';	out << 't';		break;
+		case 0x08:	out << '\\';	out << 'b';		break;
+		case 0x0c:	out << '\\';	out << 'f';		break;
+		case '\\':	out << '\\';	out << '\\';	break;
+		//case '/':	out << '\\';	out << '/';		break;	// slash doesn't have to be escaped
+		case '"':	out << '\\';	out << '\"';	break;
+		default:
+			out << str[i];
+		}
+	}
+}
+
+
+} // namespace Winix
+
+
 #endif

core/mount.cpp

@@ -1,16 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include "mount.h"
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
+
 
 Mount::Mount()
 {
@@ -109,3 +139,7 @@ const std::wstring & Mount::FirstArg(int code) const
 	return Arg(code, 0);
 }
 
+
+
+} // namespace Winix
+

core/mount.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 
@@ -16,6 +41,10 @@
 #include <vector>
 
 
+namespace Winix
+{
+
+
 
 class Mount
 {
@@ -67,5 +96,8 @@ private:
 
 
 
+} // namespace Winix
+
+
 #endif
 

core/mountparser.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "mountparser.h"
@@ -12,6 +37,11 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
+
 MountParser::MountParser()
 {
 	dirs = 0;
@@ -494,9 +524,5 @@ void MountParser::Parse(const std::wstring & input, std::map<long, Mount> & outp
 
 
 
-
-
-
-
-
+} // namespace Winix
 

core/mountparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_mountparser
@@ -22,6 +47,11 @@
 
 
 
+namespace Winix
+{
+
+
+
 class MountParser
 {
 public:
@@ -82,4 +112,8 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/mounts.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "mounts.h"
@@ -15,6 +40,10 @@
 
 
 
+namespace Winix
+{
+
+
 
 Mounts::Mounts()
 {
@@ -321,3 +350,8 @@ Mount * Mounts::GetEmptyMount()
 {
 	return &empty_mount;
 }
+
+
+
+} // namespace Winix
+

core/mounts.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2009-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2009-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 
@@ -23,6 +48,11 @@
 #include "mountparser.h"
 
 
+namespace Winix
+{
+
+
+
 
 class Mounts
 {
@@ -165,5 +195,8 @@ private:
 };
 
 
+} // namespace Winix
+
+
 
 #endif

core/plugin.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <dlfcn.h>
@@ -14,6 +39,9 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
 
 
 void Plugin::UnloadPlugins()
@@ -177,7 +205,7 @@ void * Plugin::LoadInitFun(const char * filename, Fun1 & fun_init)
 		return 0;
 	}
 	
-	fun_init = (Fun1)dlfunc(p, "Init");
+	fun_init = (Fun1)dlsym(p, "Init");
 	
 	if( !fun_init )
 	{
@@ -500,3 +528,6 @@ const Plugin::Plugins * Plugin::GetPlugins()
 	return &plugins;
 }
 
+
+} // namespace Winix
+

core/plugin.h

@@ -1,12 +1,36 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
- 
 
 #ifndef headerfile_winix_core_plugin
 #define headerfile_winix_core_plugin
@@ -26,6 +50,12 @@
 #include "templates/templates.h"
 
 
+namespace Winix
+{
+
+
+
+
 /*
 	all your plugin functions can have signature either:
 	void my_function(PluginInfo & info); or
@@ -246,5 +276,9 @@ private:
 
 extern Plugin plugin;
 
+
+} // namespace Winix
+
+
 #endif
 

core/plugindata.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "plugindata.h"
@@ -13,6 +38,10 @@
 #include "session.h"
 
 
+namespace Winix
+{
+
+
 
 
 PluginData::PluginData()
@@ -153,3 +182,8 @@ size_t old_size = table.size();
 	for(size_t i = old_size ; i<new_size ; ++i)
 		table[i] = 0;
 }
+
+
+
+} // namespace Winix
+

core/plugindata.h

@@ -1,16 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_plugindata
 #define headerfile_winix_core_plugindata
 
 #include <vector>
+#include <cstddef>
+
+namespace Winix
+{
+
 
 
 struct Session;
@@ -65,5 +95,8 @@ private:
 
 
 
+} // namespace Winix
+
+
 #endif
 

core/pluginmsg.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 
@@ -12,6 +37,12 @@
 #define headerfile_winix_core_pluginmsg
 
 
+namespace Winix
+{
+
+
+
+
 // here you can add your own EZC functions ([function])
 // PluginInfo.p1 is a pointer to Ezc::Functions object
 // session pointer is null
@@ -255,6 +286,15 @@
 // to the resource
 #define WINIX_CHECK_PLUGIN_ACCESS			31060
 
+// http headers (without cookies) were created and are ready to send
+// here you can make some changes to them
+// in p1 you have a pointer to the PT::Space (Request::out_headers)
+#define WINIX_PREPARE_TO_SEND_HTTP_HEADERS			31070
+
+// http cookies were created and are ready to send
+// here you can make some changes to them
+// in p1 you have a pointer to the PT::Space (Request::out_cookies)
+#define WINIX_PREPARE_TO_SEND_HTTP_COOKIES			31080
 
 
 /*
@@ -283,5 +323,9 @@
 // see plugins/ticket/pluginmsg.h
 
 
+} // namespace Winix
+
+
+
 
 #endif

core/postmultiparser.cpp

@@ -1,18 +1,51 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
+#include <sys/types.h>
+#include <unistd.h>
 #include "postmultiparser.h"
 #include "log.h"
 #include "utf8/utf8.h"
 
 
 
+namespace Winix
+{
+
+
+
+
 PostMultiParser::PostMultiParser()
 {
 	in_buffer = new unsigned char[WINIX_POSTMULTI_INPUT_BUFFER];
@@ -584,3 +617,8 @@ Error PostMultiParser::Parse(FCGX_Stream * in_, PostTab & post_tab_, PostFileTab
 
 return err;
 }
+
+
+
+} // namespace Winix
+

core/postmultiparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #ifndef headerfile_winix_core_postmultiparser
@@ -19,6 +44,11 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
+
 // 2 MB
 #define WINIX_POSTMULTI_INPUT_BUFFER  2097152
 #define WINIX_POSTMULTI_OUTPUT_BUFFER 2097152
@@ -128,5 +158,8 @@ return added;
 
 
 
+} // namespace Winix
+
+
 
 #endif

core/postparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_postparser
@@ -21,6 +46,10 @@
 #include "plugin.h"
 
 
+namespace Winix
+{
+
+
 
 class PostParser : public HttpSimpleParser
 {
@@ -148,4 +177,8 @@ public:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/rebus.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <cstdlib>
@@ -15,6 +40,11 @@
 #include "cur.h"
 
 
+namespace Winix
+{
+
+
+
 
 void Rebus::SetCur(Cur * pcur)
 {
@@ -149,7 +179,9 @@ bool Rebus::CheckRebus()
 	if( IsAnswerOk(cur->session->rebus_item, cur->request->PostVar(L"rebus")) )
 		return true;
 
-	log << log1 << "Rebus: rebus has an incorrect answer" << logend;
+	log << log1 << "Rebus: rebus has an incorrect answer, expected: "
+		<< cur->session->rebus_item->answer << logend;
+
 	// don't add cur->session->spam_score when the rebus has incorrect answer
 	// a user could have made a mistake
 
@@ -160,9 +192,5 @@ return false;
 
 
 
-
-
-
-
-
+} // namespace Winix
 

core/rebus.h

@@ -1,20 +1,49 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_rebus
 #define headerfile_winix_core_rebus
 
-
 #include <string>
 #include <vector>
 
 
+namespace Winix
+{
+
+
+
 struct Cur;
 
 
@@ -48,4 +77,9 @@ private:
 
 };
 
+
+
+} // namespace Winix
+
+
 #endif

core/request.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include "request.h"
@@ -14,6 +39,9 @@
 
 
 
+namespace Winix
+{
+
 
 
 
@@ -21,6 +49,7 @@
 Request::Request() : char_empty(0)
 {
 	id = 0;
+	config = 0;
 }
 
 
@@ -30,36 +59,29 @@ void Request::SetConfig(Config * pconfig)
 }
 
 
-void Request::ClearAjax()
+
+
+void Request::ClearOutputStreams()
 {
-size_t i = ajax.spaces.size();
+size_t len = 16;
 
-	while( i-- > 0 )
-		ajax.RemoveSpace(i);
+	if( config )
+		len = config->ezc_out_streams_size;
 
-	ajax.table.clear();
+	if( len < 1 || len > 64 )
+		len = 16;
 
-	PT::Space::TableSingle::iterator s = ajax.table_single.begin();
+	out_streams.resize(len);
+	use_html_filter.resize(len);
 
-	while( s != ajax.table_single.end() )
+	for(size_t i=0 ; i<out_streams.size() ; ++i)
 	{
-		if( s->first != L"content" && s->first != L"http_status" )
-		{
-			ajax.table_single.erase(s++);
-		}
-		else
-		{
-			// small optimization when deleting
-			// the memory for "content" and "http_status" will be reused
-			s->second.clear();
-
-			++s;
-		}
+		out_streams[i].Clear();
+		use_html_filter[i] = true;
 	}
 }
 
 
-
 void Request::Clear()
 {
 	// id is never 0	
@@ -67,21 +89,18 @@ void Request::Clear()
 		++id;
 
 	RemovePostFileTmp(post_file_tab);
+	ClearOutputStreams();
 
 	post_tab.clear();
 	post_file_tab.clear();
 	cookie_tab.clear();
 
-	method  = none;	
-	role    = responder;
+	method = unknown_method;
 
-	headers.Clear();
-	page.Clear();
-	ajaxpage.Clear();
-	debug.Clear();
+	out_headers.Clear();
+	out_cookies.Clear();
 
 	page_generated = false;
-	use_html_filter = true;
 	
 	env_request_method  = &char_empty;
 	env_request_uri     = &char_empty;
@@ -99,7 +118,7 @@ void Request::Clear()
 	dir_tab.clear();
 	last_item = &item;
 	is_item = false;
-	function = 0; // !! dodac jakas empty funkcje
+	function = 0;
 	param_tab.clear();
 	anchor.clear();
 	
@@ -117,18 +136,20 @@ void Request::Clear()
 	start_date.Clear();
 
 	subdomain.clear();
-	ClearAjax();
-	ajax_serializer = 0;
+	return_info_only = false;
+	info.Clear();
+	info_serializer = 0;
+	return_json = false;
 
-	binary_page.clear();
-	compressed_page.clear();
-	use_text_page = true;
+	out_bin_stream.clear();
+	send_bin_stream = false;
 
 	gen_trim_white			= false;
 	gen_skip_new_line		= false;
 	gen_use_special_chars	= false;
 
 	ip = 0;
+	use_200_status_for_not_found_and_permission_denied = false;
 }
 
 
@@ -144,43 +165,6 @@ void Request::RequestStarts()
 
 
 
-// value can be null
-void Request::SetCookie(const char * name, const char * value, PT::Date * expires)
-{
-	headers << "Set-Cookie: " << name << "=";
-	
-	if( value && value[0]!=0 )
-		headers << value;
-	else
-		headers << "\"\"";
-
-	if( expires )
-		headers << "; expires=" << DateToStrCookie(*expires) << " GMT";
-
-	headers << "; path=/; domain=" << config->base_url << "\r\n";
-	
-	/*
-		don't use '; secure' flag if you are using both sites (with SSL
-		and without SSL) -- with secure flag the cookie is sent only through
-		SSL and if you accidentally open a new window without SSL (http://) 
-		then winix will create a new session for you and the previous session (https://)
-		will be lost (cookie is overwritten on the client browser)
-	*/
-}
-
-
-
-void Request::SetCookie(const char * name, long value, PT::Date * expires)
-{
-	headers << "Set-Cookie: " << name << "=" << value;
-
-	if( expires )
-		headers << "; expires=" << DateToStrCookie(*expires) << " GMT";
-
-	headers << "; path=/; domain=" << config->base_url << "\r\n";
-}
-
-
 
 bool Request::IsPostVar(const wchar_t * var)
 {
@@ -351,4 +335,7 @@ const std::wstring & Request::ParamValue(const std::wstring & param_name)
 
 
 
+} // namespace Winix
+
+
 

core/request.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_request
@@ -22,6 +47,12 @@
 #include "date/date.h"
 #include "space/space.h"
 #include "space/spacetojson.h"
+#include "textstream/textstream.h"
+
+
+namespace Winix
+{
+
 
 
 
@@ -32,52 +63,69 @@ class FunctionBase;
 
 struct Request
 {
-	// request id
-	// is incremented for each request and is never 0
-	// (from -1 will be incremented twice)
-	// it's used for some optimalizations e.g. in templates
+	/*
+		request id
+		is incremented for each request and is never 0
+		(from -1 will be incremented to one)
+		it's used for some optimizations e.g. in templates
+	*/
 	size_t id;
 
-	// !! moze pozbyc sie tego none?
-	enum Method { get, post, head, none } method;
-	enum Role   { responder, authorizer } role;
 
-	// headers, page and debug
-	//std::ostringstream headers, page, debug;
-	TextStream<std::string>  headers;
-	HtmlTextStream page, debug;
-	TextStream<std::wstring> ajaxpage;
+	/*
+		request start time
+		Time() methods are very slow so it is better to directly use those two values
+		they are set when a request starts
+	 */
+	time_t   start_time;
+	PT::Date start_date;
 
-	// binary page
-	BinaryPage binary_page;
 
-	// a compressed page ready to send to the client
-	BinaryPage compressed_page;
 
-	// if true then either page or ajaxpage will be sent to the client
-	// if false then binary_page is sent
-	// default: true
-	bool use_text_page;
+	/*
+	 *
+	 *
+	 *
+	 * variables representing input from client's browser
+	 *
+	 *
+	 *
+	*/
 
-	// if set to true then the standard template system will not be generated
-	// default: false
-	bool page_generated;
+	/*
+		the HTTP method
+		!! IMPROVE ME add the rest methods here
+	*/
+	enum Method { get, post, head, unknown_method } method;
 
-	// whether or not the html filter should be used
-	// default: true
-	bool use_html_filter;
 
-	// raw parameters
+	/*
+		subdomain
+		subdomain = HTTP_HOST environment variable - config->base_url
+	*/
+	std::wstring subdomain;
+
+
+	/*
+		raw parameters
+		!! CHECK ME may post_tab and cookie_tab should be changed to PT::Space now?
+		or may change the name to cookie_in? or in_cookie?
+	*/
 	PostTab     post_tab;
 	PostFileTab post_file_tab;
 	CookieTab   cookie_tab;
-	
-	// html anchor (those part of URI after '#' character)
+
+
+	/*
+		html anchor (those part of URI after '#' character)
+	*/
 	std::wstring anchor;
 
+
 	// environment variables
 	// they are not null -- when the server doesn't have such a variable
 	// it will be pointing into 'char_empty' which is default '\0'
+	// !! IMPROVE ME change it to std::wstring, or may PT::Space too?
 	const char * env_request_method;
 	const char * env_request_uri;
 	const char * env_http_cookie;
@@ -88,46 +136,65 @@ struct Request
 	const char * env_fcgi_role;
 	const char * env_content_type;
 	const char * env_https;
-	
+
 	// current IP address of the remote host (read from REMOTE_ADDR environment variable)
 	// (at the moment only IPv4 are supported)
 	int ip;
 
 	// true if the browser is Microsoft Internet Explorer
 	bool browser_msie;
-	
+
     // true if the browser is Konqueror
     bool browser_konqueror;
 
-	// true if we are using encrypted connection (SSL)
+	// true if we are using an encrypted connection (SSL)
 	bool using_ssl;
 
+
+	/*
+		request input variables representing the winix filesystem
+	*/
+
 	// current directory
 	std::vector<Item*> dir_tab;
 
 	// true if a file exists
 	bool is_item;
-	
-	// current file (if exists)
+
+	// current file (valid if is_item is true)
 	Item item;
 
 	// current winix function
 	// null if there is no a function
 	FunctionBase * function;
-	
+
 	// parameters (name:value)
 	ParamTab param_tab;
 
+	// this is a pointer either to the item (if exists) or to the last directory
+	Item * last_item;
+
+
+
+
+	/*
+	 *
+	 *
+	 *
+	 * variables for generating output to the client's browser
+	 *
+	 *
+	 *
+	*/
+
+
 	// request status
+	// !! CHANGE ME it'll be better to use ordinary http result codes
 	Error status;
-	
-	// usually items in the current directory (depends on the function)
-	std::vector<Item> item_tab;
 
 	// if not empty means an address for redirecting to
 	// it should be url-encoded
 	std::wstring redirect_to;
-	std::string aredirect_to;
 
 	// a redirect type
 	// following redirect types are supported:
@@ -141,30 +208,108 @@ struct Request
 	// send header X-LIGHTTPD-send-file with path to a file
 	std::wstring x_sendfile;
 
-	// send as attachment (causes header: content-disposition: attachment)
+	// send as attachment (causes generating header: content-disposition: attachment)
 	bool send_as_attachment;
 
-	// this is a pointer either to the item (if exists) or to the last directory
-	Item * last_item;
+	// headers send to the client (without cookies)
+	PT::Space out_headers;
 
-	// request start time
-	// Time() methods are very slow so it is better to directly use those two values
-	// they are set when a request starts
-	time_t   start_time;
-	PT::Date start_date;
+	// cookies send to the client
+	// a value can be either a cookie value or the whole cookie string (with domain, date etc)
+	PT::Space out_cookies;
 
-	// a subdomain
-	// subdomain = HTTP_HOST environment variable - config->base_url
-	std::wstring subdomain;
+	// winix can return either a text answer or a binary answer
+	// if send_bin_stream is true then the binary answer is sent (out_bin_stream)
+	// or if send_bin_stream is false then the text answer is sent
+	// default: false
+	//
+	//
+	//                                   winix answer send to the client's browser
+	//                                                       |
+	//                                                       |
+	//                                          depending on send_bin_stream
+	//                    (if false) ------------------------------------------------- (if true)
+	//                               |                                               |
+	//                          text answer                                     binary answer
+	//                               |                                               |
+	//                   depending on return_json                          sending out_bin_stream
+	//  (if false) ------------------------------------ (if true)
+	//             |                                  |
+	//       normal request                     ajax request
+	//             |                                  |
+	//   sending out_streams[0]                       |
+	//                                                |
+	//                                                |
+	//                                    depending on return_info_only
+	//                   (if false) ------------------------------------------------------ (if true)
+	//                              |                                                    |
+	//                 generating JSON object from:                   generating JSON object only from info
+	//                 out_streams and info, e.g.:                    e.g.:
+	//                 {                                              { info object serialized here }
+	//                  "stream_1": "some html content",
+	//                  "stream_2": "some other html content",
+	//                  "info": { info object serialized here }
+	//                 }
+	//                 note that out_streams[0] is not sent
+	//                 in JSON answers
+	//
+	//
+	bool send_bin_stream;
 
-	// used as a JSON output (when ajax_serializer is defined)
-	// it will be serialized and have at least:
-	// 'content' string - the whole html content
-	// 'http_status' integer - http status code (e.g. 200)
-	PT::Space ajax;
+	// binary page sent to the client if send_bin_stream is true
+	BinaryPage out_bin_stream;
 
-	// if not null then the request will have a JSON as an output
-	PT::SpaceToJSON * ajax_serializer;
+	// when returning the text answer we can either return the whole html page (normal requests)
+	// or a JSON object (for requests generated from AJAX)
+	// if return_json is false then we return the whole html page (which is in out_streams[0])
+	// if return_json is true we are creating an JSON object from out_streams
+	// (zero stream is ignored) and from info space (see above picture)
+	// (or just only from info if return_info_only is true)
+	// default: false
+	// return_json is set to true by App at the beginning of a request
+	// if reqtype:json parameter is present (in the url)
+	// note: return_json is only valid if send_bin_stream is false
+	bool return_json;
+
+	// main text output streams where the html otput is generated from ezc templates
+	// the zero stream (out_streams[0]) is used as the main stream
+	// to which the whole html page (with doctype, head, body) is generated
+	// the rest streams can be only used in ajax requests (send in JSON format to the client)
+	// in ezc templates you can use [ezc stream ...] keyword
+	// to switch between streams e.g. [ezc stream "0" "2"]
+	std::vector<HtmlTextStream> out_streams;
+
+	// if true the JSON object is generated only from info (out_streams are not used)
+	// default: false
+	bool return_info_only;
+
+	// additional info added when sending the JSON answer
+	PT::Space info;
+
+	// info serializer
+	// if not set then the json_generic_serializer from App will be used
+	// default: null (json_generic_serializer used)
+	PT::SpaceToJSON * info_serializer;
+
+
+
+
+	// if set to true then the standard template system will not be used
+	// default: false
+	bool page_generated;
+
+	// whether or not the html filter should be used
+	// the size of the table is the same as out_streams
+	// default: all items true
+	std::vector<bool> use_html_filter;
+
+	
+
+
+	// if this variable is true then winix always return 200 OK header
+	// when the status would be 404 (not found) or 403 (permission denied)
+	// default: false
+	bool use_200_status_for_not_found_and_permission_denied;
 
 	// options used by ezc generators
 	bool gen_trim_white;
@@ -172,8 +317,27 @@ struct Request
 	bool gen_use_special_chars;
 
 
+
+
+	/*
+		additional variables used for common uses
+	*/
+
+	// usually items in the current directory (depends on the function)
+	std::vector<Item> item_tab;
+
+
+
+
+
+
+
+
+
+
 	Request();
 	void SetConfig(Config * pconfig);
+
 	void RequestStarts();
 	void Clear();
 
@@ -181,29 +345,32 @@ struct Request
 
 	bool IsParam(const wchar_t * param_name);
 	bool IsParam(const std::wstring & param_name);
-
 	const std::wstring & ParamValue(const wchar_t * param_name);      // returns an empty string if there is no such a parameter
 	const std::wstring & ParamValue(const std::wstring & param_name); // returns an empty string if there is no such a parameter
 
-	void SetCookie(const char * name, const char * value, PT::Date * expires = 0);
-	void SetCookie(const char * name, long value,         PT::Date * expires = 0);
-
 	bool IsPostVar(const wchar_t * var);
 	bool IsPostVar(const std::wstring & var);
-
 	const std::wstring & PostVar(const wchar_t * var);				// returns an empty string if there is no such a parameter
 	const std::wstring & PostVar(const std::wstring & var);			// returns an empty string if there is no such a parameter
-
-
 	bool PostVar(const wchar_t * var, std::wstring & result);
 	bool PostVar(const std::wstring & var, std::wstring & result);
-
 	std::wstring * PostVarp(const wchar_t * var);
 	std::wstring * PostVarp(const std::wstring & var);
 
 	bool AllPostVarEmpty(); // returning true if all post vars are empty
 
-	void SendAll();
+
+	// setting a cookie
+	// name  - cookie name (either const wchar_t, or std::wstring or PT::WTextStream)
+	// value - cookie value (can be everything which can be put to PT::WTextStream stream)
+	// the return std::wstring reference is a reference to the cookie inserted value (in out_cookies structure)
+	template<typename NameType, typename ValueType>
+	std::wstring & AddCookie(const NameType & name, const ValueType & value, PT::Date * expires = 0);
+
+	template<typename NameType, typename ValueType>
+	std::wstring & AddCookie(const NameType & name, const ValueType & value, PT::Date & expires);
+
+
 
 
 private:
@@ -217,14 +384,51 @@ private:
 	// used in ParamValue() and PostVar() when there is no such a param
 	const std::wstring str_empty;
 
-	void ClearAjax();
+	void ClearOutputStreams();
 
 };
 
 
 
+template<typename NameType, typename ValueType>
+std::wstring & Request::AddCookie(const NameType & name, const ValueType & value, PT::Date * expires)
+{
+PT::WTextStream cookie;
+
+	cookie << value;
+
+	if( cookie.empty() )
+		cookie << L"\"\""; // cookie empty value
+
+	if( expires )
+		cookie << L"; expires=" << DateToStrCookie(*expires) << L" GMT";
+
+	cookie << L"; path=/; domain=" << config->base_url;
+
+	/*
+		!! IMPROVE ME add an option to the config
+
+		don't use '; secure' flag if you are using both sites (with SSL
+		and without SSL) -- with secure flag the cookie is sent only through
+		SSL and if you accidentally open a new window without SSL (http://)
+		then winix will create a new session for you and the previous session (https://)
+		will be lost (the session cookie will be overwritten in the client's browser)
+	*/
+
+return out_cookies.Add(name, cookie);
+}
+
+
+template<typename NameType, typename ValueType>
+std::wstring & Request::AddCookie(const NameType & name, const ValueType & value, PT::Date & expires)
+{
+	return AddCookie(name, value, &expires);
+}
 
 
 
 
+} // namespace Winix
+
 #endif
+

core/requesttypes.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_requesttypes
@@ -16,6 +41,12 @@
 #include "textstream/textstream.h"
 
 
+namespace Winix
+{
+
+
+
+// !! IMPROVE ME
 // !! narazie uzywane tylko w post multi parserze
 // dodac do zwyklego parsera post
 #define WINIX_POSTTABLE_MAXSIZE 50
@@ -43,10 +74,14 @@ typedef std::map<std::wstring, std::wstring> PostTab;
 typedef std::map<std::wstring, PostFile>     PostFileTab;
 typedef std::vector<Param>                   ParamTab;
 
-typedef std::map<std::string, std::string>   CookieTab;
+typedef std::map<std::wstring, std::wstring> CookieTab;
 
 
 typedef PT::TextStreamBase<char, 1, 4096> BinaryPage;
 
 
+
+} // namespace Winix
+
+
 #endif

core/run.cpp

@@ -1,21 +1,52 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <cstring>
 #include "run.h"
 #include "log.h"
 
 
 
+namespace Winix
+{
+
+
+
 
 Run::Run()
 {
@@ -384,3 +415,6 @@ int Run::Go(std::string & out)
 }
 
 
+
+} // namespace Winix
+

core/run.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_run
@@ -12,6 +37,12 @@
 
 #include <string>
 #include <cstdio>
+#include <unistd.h>
+
+
+namespace Winix
+{
+
 
 
 /*
@@ -159,5 +190,9 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif
 

core/session.cpp

@@ -1,16 +1,44 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "session.h"
 #include "misc.h"
 
 
+namespace Winix
+{
+
 
 
 Session::Session()
@@ -86,9 +114,13 @@ void Session::Clear(bool clear_plugin_data)
 
 
 // clearing some variables when a request is ended (just for safety)
-void Session::ClearOnEndRequest()
+void Session::ClearAfterRequest()
 {
 	// ip_ban list can be sorted by SessionManager (in the special thread)
 	ip_ban = 0;
 }
 
+
+
+} // namespace Winix
+

core/session.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_session
@@ -23,6 +48,10 @@
 #include "ipban.h"
 
 
+namespace Winix
+{
+
+
 
 struct Session
 {
@@ -32,7 +61,7 @@ struct Session
 
 	void SetTimesTo(time_t time);
 	void Clear(bool clear_plugin_data = true);
-	void ClearOnEndRequest();
+	void ClearAfterRequest();
 
 
 	// 0 - means that there is a temporary session
@@ -95,6 +124,9 @@ struct Session
 
 
 
+} // namespace Winix
+
+
 
 #endif
 

core/sessioncontainer.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "sessioncontainer.h"
@@ -12,6 +37,11 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
+
 
 SessionContainer::SessionContainer()
 {
@@ -207,5 +237,8 @@ return false;
 
 
 
+} // namespace Winix
+
+
 
 

core/sessioncontainer.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_sessioncontainer
@@ -19,6 +44,11 @@
 #include "config.h"
 
 
+namespace Winix
+{
+
+
+
 
 class SessionContainer
 {
@@ -71,4 +101,8 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif

core/sessionmanager.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <sys/stat.h>
@@ -17,6 +42,9 @@
 
 
 
+namespace Winix
+{
+
 
 
 
@@ -89,7 +117,7 @@ long id;
 	{
 		if( sizeof(long) == 8 )
 		{
-			id = ((unsigned long)std::rand()) << 32 + std::rand();
+			id = (((unsigned long)std::rand()) << 32) + std::rand();
 		}
 		else
 		{
@@ -157,7 +185,7 @@ void SessionManager::SetTemporarySession()
 
 
 
-bool SessionManager::SetSessionFromCookie(const std::string & cookie)
+bool SessionManager::SetSessionFromCookie(const std::wstring & cookie)
 {
 	long id = Tol(cookie.c_str());
 	SessionContainer::Iterator s = session_tab.FindById(id);
@@ -603,3 +631,6 @@ void SessionManager::DeleteSession(Session * del_session)
 
 
 
+
+} // namespace Winix
+

core/sessionmanager.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_sessionmanager
@@ -24,6 +49,11 @@
 
 
 
+namespace Winix
+{
+
+
+
 class SessionManager : public BaseThread
 {
 public:
@@ -88,7 +118,7 @@ private:
 	
 	long CreateSessionId();
 	void CreateSession();
-	bool SetSessionFromCookie(const std::string & cookie);
+	bool SetSessionFromCookie(const std::wstring & cookie);
 	void SetTemporarySession();
 
 	// second thread
@@ -102,4 +132,7 @@ private:
 };
 
 
+} // namespace Winix
+
+
 #endif

core/sessionparser.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "sessionparser.h"
@@ -12,6 +37,10 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
 
 bool SessionParser::Parse(const std::string & path, SessionContainer & container)
 {
@@ -166,3 +195,7 @@ bool is_sign = false;
 return res;
 }
 
+
+
+} // namespace Winix
+

core/sessionparser.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2010, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_sessionparser
@@ -17,6 +42,10 @@
 #include "users.h"
 
 
+namespace Winix
+{
+
+
 
 class SessionParser
 {
@@ -46,5 +75,9 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif
 

core/slog.cpp

@@ -1,15 +1,44 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "slog.h"
 
 
+namespace Winix
+{
+
+
 
 
 SLog::SLog()
@@ -222,3 +251,6 @@ SLog & SLog::operator<<(TranslateTextHelper<std::wstring> raw)
 
 
 
+
+} // namespace Winix
+

core/slog.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_slog
@@ -16,6 +41,11 @@
 #include "textstream/textstream.h"
 
 
+namespace Winix
+{
+
+
+
 #define WINIX_SLOG_MAX_LOG_SIZE 10240
 
 
@@ -137,5 +167,9 @@ return *this;
 extern SLog slog;
 
 
+
+} // namespace Winix
+
+
 #endif
 

core/synchro.cpp

@@ -1,20 +1,64 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
 
 #include <errno.h>
 #include "synchro.h"
 
 
-Synchro::Synchro() : mutex(PTHREAD_MUTEX_INITIALIZER)
+
+namespace Winix
+{
+
+
+
+Synchro::Synchro()
 {
 	was_stop_signal = false;
-	ref = 0;
+
+#ifdef __FreeBSD__
+	/*
+	 * on FreeBSD a pthread's pthread_mutex_lock() is checking for deadlocks by default
+	 */
+	mutex = PTHREAD_MUTEX_INITIALIZER;
+#else
+	pthread_mutexattr_t attr;
+
+	pthread_mutexattr_init(&attr);
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+	pthread_mutex_init(&mutex, &attr);
+	pthread_mutexattr_destroy(&attr);
+#endif
 }
 
 
@@ -23,29 +67,34 @@ bool Synchro::Lock()
 {
 	int res = pthread_mutex_lock(&mutex);
 
-	if( res == EDEADLK )
+	if( res == 0 )
 	{
-		// Lock() method in this thread was called before
-		ref += 1;
+		ref[pthread_self()] = 1;
 		return true;
 	}
 	else
+	if( res == EDEADLK )
 	{
-		ref = 0;
+		// Lock() method in this thread was called before
+		ref[pthread_self()] += 1;
+		return true;
 	}
 
-return res == 0;
+return false;
 }
 
 
 
 void Synchro::Unlock()
 {
-	if( ref > 0 )
+	int & r = ref[pthread_self()];
+
+	if( r > 1 )
 	{
-		ref -= 1;
+		r -= 1;
 	}
 	else
+	if( r == 1 )
 	{
 		pthread_mutex_unlock(&mutex);
 	}
@@ -54,4 +103,5 @@ void Synchro::Unlock()
 
 
 
+} // namespace Winix
 

core/synchro.h

@@ -1,16 +1,46 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_synchro
 #define headerfile_winix_core_synchro
 
 #include <pthread.h>
+#include <map>
+
+
+namespace Winix
+{
 
 
 
@@ -31,13 +61,16 @@ struct Synchro
 
 private:
 
-	// deadlock counter
+	// deadlock counter for each thread
 	// we can call Lock() more than one in the same thread
-	int ref;
+	std::map<pthread_t, int> ref;
 
 };
 
 
+} // namespace Winix
+
+
 #endif
 
 

core/system.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "system.h"
@@ -16,6 +41,12 @@
 
 
 
+namespace Winix
+{
+
+
+
+
 void System::SetCur(Cur * pcur)
 {
 	cur = pcur;
@@ -144,13 +175,37 @@ bool ssl = false;
 }
 
 
+void System::CreateItemLink(long parent_id, const std::wstring & url, const std::wstring & subdomain,
+							std::wstring & link, bool clear_str)
+{
+	PutUrlProto(config->use_ssl, link, clear_str);
+
+	if( !subdomain.empty() )
+	{
+		link += subdomain;
+		link += '.';
+	}
+
+	link += config->base_url;
+	dirs.MakePath(parent_id, link, false); // !! IMPROVE ME may some kind of error checks here?
+	link += url;
+}
+
+
+void System::CreateItemLink(const Item & item, std::wstring & link, bool clear_str)
+{
+	CreateItemLink(item.parent_id, item.url, cur->request->subdomain, link, clear_str);
+}
+
+
+
 // !! IMPROVE ME
 // !! mozna zrobic jakas obsluge kiedy nie mozemy sie redirectnac, np gdy wystapil blad
 // !! moze zwracac jakas wartosc?
 /*
 	postfix will not be UrlEncoded
 */
-void System::RedirectTo(const Item & item, const wchar_t * postfix)
+void System::RedirectTo(const Item & item, const wchar_t * postfix, bool use_reqtype)
 {
 	PutUrlProto(config->use_ssl, cur->request->redirect_to);
 
@@ -176,6 +231,12 @@ void System::RedirectTo(const Item & item, const wchar_t * postfix)
 
 	if( postfix )
 		cur->request->redirect_to += postfix;
+
+	if( use_reqtype && cur->request->IsParam(L"reqtype") )
+	{
+		cur->request->redirect_to += L"/-/reqtype:";
+		cur->request->redirect_to += cur->request->ParamValue(L"reqtype");
+	}
 }
 
 
@@ -183,7 +244,7 @@ void System::RedirectTo(const Item & item, const wchar_t * postfix)
 /*
 	postfix will not be UrlEncoded
 */
-void System::RedirectTo(long item_id, const wchar_t * postfix)
+void System::RedirectTo(long item_id, const wchar_t * postfix, bool use_reqtype)
 {
 	PutUrlProto(config->use_ssl, cur->request->redirect_to);
 
@@ -224,6 +285,12 @@ void System::RedirectTo(long item_id, const wchar_t * postfix)
 
 	if( postfix )
 		cur->request->redirect_to += postfix;
+
+	if( use_reqtype && cur->request->IsParam(L"reqtype") )
+	{
+		cur->request->redirect_to += L"/-/reqtype:";
+		cur->request->redirect_to += cur->request->ParamValue(L"reqtype");
+	}
 }
 
 
@@ -231,7 +298,7 @@ void System::RedirectTo(long item_id, const wchar_t * postfix)
 /*
 	url will not be UrlEncoded
 */
-void System::RedirectTo(const wchar_t * url)
+void System::RedirectTo(const wchar_t * url, bool use_reqtype)
 {
 	PutUrlProto(config->use_ssl, cur->request->redirect_to);
 
@@ -262,15 +329,21 @@ void System::RedirectTo(const wchar_t * url)
 			cur->request->redirect_to += url;
 		}
 	}
+
+	if( use_reqtype && cur->request->IsParam(L"reqtype") )
+	{
+		cur->request->redirect_to += L"/-/reqtype:";
+		cur->request->redirect_to += cur->request->ParamValue(L"reqtype");
+	}
 }
 
 
 /*
 	url will not be UrlEncoded
 */
-void System::RedirectTo(const std::wstring & url)
+void System::RedirectTo(const std::wstring & url, bool use_reqtype)
 {
-	RedirectTo(url.c_str());
+	RedirectTo(url.c_str(), use_reqtype);
 }
 
 
@@ -324,38 +397,52 @@ void System::RedirectWithFunctionAndParamsTo(const std::wstring & url)
 }
 
 
-void System::RedirectToLastDir(const wchar_t * postfix)
+void System::RedirectToLastDir(const wchar_t * postfix, bool use_reqtype)
 {
 	if( !cur->request->dir_tab.empty() )
-		RedirectTo( *cur->request->dir_tab.back(), postfix );
+		RedirectTo( *cur->request->dir_tab.back(), postfix, use_reqtype);
 }
 
 
-void System::RedirectToLastItem(const wchar_t * postfix)
+void System::RedirectToLastItem(const wchar_t * postfix, bool use_reqtype)
 {
 	if( cur->request->last_item )
-		RedirectTo( *cur->request->last_item, postfix );
+		RedirectTo( *cur->request->last_item, postfix, use_reqtype );
 }
 
 
-void System::RedirectToLastFunction(const wchar_t * postfix)
+void System::RedirectToLastFunction(const wchar_t * postfix, bool use_reqtype)
 {
-	RedirectToLastDir();
+	RedirectToLastDir(0, false);
+	TrimLast(cur->request->redirect_to, '/');
 
 	if( cur->request->is_item )
 	{
-		cur->request->redirect_to += cur->request->item.url;
 		cur->request->redirect_to += '/';
+		cur->request->redirect_to += cur->request->item.url;
 	}
 
 	if( cur->request->function )
+	{
+		cur->request->redirect_to += '/';
 		cur->request->redirect_to += cur->request->function->fun.url;
+	}
 
 	if( postfix )
 	{
 		cur->request->redirect_to += '/';
 		cur->request->redirect_to += postfix;
 	}
+
+	if( use_reqtype && cur->request->IsParam(L"reqtype") )
+	{
+		if( !cur->request->function && !postfix )
+			cur->request->redirect_to += L"/-";
+
+		cur->request->redirect_to += L"/reqtype:";
+		cur->request->redirect_to += cur->request->ParamValue(L"reqtype");
+	}
+
 }
 
 
@@ -790,7 +877,7 @@ return res;
 
 // making a global file path (in the unix file system)
 // you should call CreateNewFile before
-bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bool create_dir, int chmod)
+bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bool create_dir, int chmod, int group)
 {
 	path.clear();
 
@@ -820,7 +907,7 @@ bool System::MakeFilePath(const Item & item, std::wstring & path, bool thumb, bo
 		path += L"/normal";
 
 
-	if( create_dir && !CreateDirs(path, item.file_path, chmod, true) )
+	if( create_dir && !CreateDirs(path, item.file_path, chmod, group, true) )
 		return false;
 
 	path += '/';
@@ -1151,6 +1238,8 @@ int System::FollowAllLinks(const std::vector<Item*> & current_dir_tab, const std
 		}
 		else
 		{
+			// !! CHECK ME
+			// FollowLink is using link_to_temp temporary variable too
 			res = FollowLink(current_dir_tab, link_to_temp, out_dir_tab, out_item);
 			link_to_temp.clear();
 
@@ -1311,3 +1400,7 @@ bool System::AddCommonFileToVar(const wchar_t * file_path, const wchar_t * url,
 return AddFile(file_content_item, false) == WINIX_ERR_OK;
 }
 
+
+
+} // namespace Winix
+

core/system.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_system
@@ -29,6 +54,11 @@
 #include "timezones.h"
 
 
+namespace Winix
+{
+
+
+
 class Functions;
 class SessionManager;
 
@@ -90,15 +120,15 @@ public:
 	void AddParams(const ParamTab & param_tab, std::wstring & str, bool clear_str = true);
 
 	void PutUrlProto(bool can_use_ssl, std::wstring & str, bool clear_str = true);
-	void RedirectTo(const Item & item, const wchar_t * postfix = 0);
-	void RedirectTo(long item_id, const wchar_t * postfix = 0);
-	void RedirectTo(const wchar_t * url);
-	void RedirectTo(const std::wstring & url);
+	void RedirectTo(const Item & item, const wchar_t * postfix = 0, bool use_reqtype = true);
+	void RedirectTo(long item_id, const wchar_t * postfix = 0, bool use_reqtype = true);
+	void RedirectTo(const wchar_t * url, bool use_reqtype = true);
+	void RedirectTo(const std::wstring & url, bool use_reqtype = true);
 	void RedirectWithFunctionAndParamsTo(const wchar_t * url);
 	void RedirectWithFunctionAndParamsTo(const std::wstring & url);
-	void RedirectToLastDir(const wchar_t * postfix = 0);
-	void RedirectToLastItem(const wchar_t * postfix = 0); // redirect to an item if exists or to the last directory
-	void RedirectToLastFunction(const wchar_t * postfix = 0);
+	void RedirectToLastDir(const wchar_t * postfix = 0, bool use_reqtype = true);
+	void RedirectToLastItem(const wchar_t * postfix = 0, bool use_reqtype = true); // redirect to an item if exists or to the last directory
+	void RedirectToLastFunction(const wchar_t * postfix = 0, bool use_reqtype = true);
 
 
 	bool CanChangeUser(const Item & item, long new_user_id);
@@ -134,7 +164,7 @@ public:
 
 	// creating item.file_path and item.file_fs (the mountpoint where the item is located)
 	bool CreateNewFile(Item & item);
-	bool MakeFilePath(const Item & item, std::wstring & path, bool thumb = false, bool create_dir = false, int chmod = 0755);
+	bool MakeFilePath(const Item & item, std::wstring & path, bool thumb = false, bool create_dir = false, int chmod = 0755, int group = -1);
 
 	bool MakePath(const Item & item, std::wstring & path, bool clear_path = true);
 
@@ -171,6 +201,13 @@ public:
 	// reloading time zones
 	void ReadTimeZones();
 
+
+	void CreateItemLink(long parent_id, const std::wstring & url, const std::wstring & subdomain,
+						std::wstring & link, bool clear_str = true);
+
+	void CreateItemLink(const Item & item, std::wstring & link, bool clear_str = true);
+
+
 private:
 	
 	Cur     * cur;
@@ -204,5 +241,9 @@ private:
 };
 
 
+
+} // namespace Winix
+
+
 #endif
 

core/textstream.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2010-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2010-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_textstream
@@ -18,6 +43,11 @@
 #include "textstream/textstream.h"
 
 
+namespace Winix
+{
+
+
+
 
 /*
 	a special class representing a stream buffer
@@ -42,6 +72,9 @@ public:
 	const StringType & Str() const;
 	const CharType * CStr() const;
 
+	void Str(const StringType & str);
+	void Str(const StringType && str);
+
 	CharType operator[](size_t index);
 
 	TextStream & operator<<(const char * str);
@@ -71,6 +104,7 @@ public:
 	TextStream & write(const char * buf, size_t len);     // for compatibility with standard library (Ezc uses it)
 	TextStream & write(const wchar_t * buf, size_t len);
 
+
 protected:
 
 	StringType buffer;
@@ -118,6 +152,21 @@ const typename TextStream<StringType>::CharType * TextStream<StringType>::CStr()
 }
 
 
+template<class StringType>
+void TextStream<StringType>::Str(const StringType & str)
+{
+	buffer = str;
+}
+
+
+template<class StringType>
+void TextStream<StringType>::Str(const StringType && str)
+{
+	buffer = str;
+}
+
+
+
 template<class StringType>
 typename TextStream<StringType>::CharType TextStream<StringType>::operator[](size_t index)
 {
@@ -345,5 +394,11 @@ return *this;
 }
 
 
+
+
+} // namespace Winix
+
+
+
 #endif
 

core/threadmanager.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <signal.h>
@@ -12,6 +37,12 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
+
+
 ThreadManager::ThreadManager()
 {
 	were_started = false;
@@ -134,3 +165,6 @@ void ThreadManager::StopAll()
 
 
 
+
+} // namespace Winix
+

core/threadmanager.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2011-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2011-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_threadmanager
@@ -16,6 +41,11 @@
 #include "synchro.h"
 
 
+namespace Winix
+{
+
+
+
 
 class ThreadManager
 {
@@ -61,5 +91,9 @@ private:
 
 };
 
+
+} // namespace Winix
+
+
 #endif
 

core/timezone.cpp

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -11,6 +36,10 @@
 #include "misc.h"
 
 
+namespace Winix
+{
+
+
 
 
 TimeZone::Dst::Dst()
@@ -287,3 +316,7 @@ return result;
 }
 
 
+
+} // namespace Winix
+
+

core/timezone.h

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -17,6 +42,12 @@
 
 
 
+namespace Winix
+{
+
+
+
+
 class TimeZone
 {
 public:
@@ -132,10 +163,7 @@ private:
 
 
 
-
-
-
-
+} // namespace Winix
 
 
 

core/timezones.cpp

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -12,6 +37,10 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
 
 TimeZones::TimeZones()
 {
@@ -174,5 +203,5 @@ bool TimeZones::ReadTimeZones(const std::wstring & path)
 
 
 
-
+} // namespace Winix
 

core/timezones.h

@@ -1,9 +1,34 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- *
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
+ * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
@@ -16,6 +41,11 @@
 #include "space/spaceparser.h"
 
 
+namespace Winix
+{
+
+
+
 
 class TimeZones
 {
@@ -77,5 +107,8 @@ private:
 
 
 
+} // namespace Winix
+
+
 
 #endif

core/ugcontainer.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_ugcontainer
@@ -15,6 +40,10 @@
 #include "log.h"
 
 
+namespace Winix
+{
+
+
 
 template<class Type>
 class UGContainer
@@ -274,4 +303,8 @@ return result;
 }
 
 
+
+} // namespace Winix
+
+
 #endif

core/user.cpp

@@ -1,15 +1,45 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2012-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include "user.h"
 
 
+namespace Winix
+{
+
+
+
 User::User()
 {
 	Clear();
@@ -32,6 +62,7 @@ void User::Clear()
 }
 
 
+
 bool User::IsMemberOf(long group)
 {
 std::vector<long>::iterator i;
@@ -47,19 +78,6 @@ return false;
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+} // namespace Winix
 
 

core/user.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_user
@@ -16,6 +41,11 @@
 #include "date/date.h"
 
 
+namespace Winix
+{
+
+
+
 #define WINIX_ACCOUNT_MAX_LOGIN_SIZE		250
 #define WINIX_ACCOUNT_MAX_PASSWORD_SIZE		250
 #define WINIX_ACCOUNT_MAX_EMAIL_SIZE		250
@@ -27,6 +57,7 @@
 #define WINIX_ACCOUNT_NOT_ACTIVATED		1
 
 // 2 - a user clicked on the link in the mail and now can normally use his account
+// (if has a password set too)
 #define WINIX_ACCOUNT_READY				2
 
 // 3 - account was suspended
@@ -36,6 +67,9 @@
 #define WINIX_ACCOUNT_BLOCKED			4
 
 
+
+
+
 /*
 	a user can login only to an account which status is equal to WINIX_ACCOUNT_READY
 
@@ -57,6 +91,8 @@
 */
 struct UserPass
 {
+	bool has_pass;				// true if the user has a password set
+								// if false the user cannot login
 	int pass_type;				// the kind of hash (WINIX_CRYPT_HASH_* see crypt.h)
 	std::wstring pass;			// password hashed or plain text if pass_type==0
 	std::string pass_encrypted; // password encrypted
@@ -74,7 +110,6 @@ struct User
 	std::wstring email;
 	int notify;
 
-
 	// environment variables which can be set by this user
 	// use 'env' winix function
 	PT::Space env;
@@ -94,7 +129,6 @@ struct User
 	// time zone identifier
 	size_t time_zone_id;
 
-
 	User();
 	
 	void Clear();
@@ -105,4 +139,7 @@ struct User
 };
 
 
+} // namespace Winix
+
+
 #endif

core/users.cpp

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #include <arpa/inet.h>
@@ -13,6 +38,10 @@
 #include "plugin.h"
 
 
+namespace Winix
+{
+
+
 
 Users::Users()
 {
@@ -292,3 +321,6 @@ long Users::HowManyLogged()
 
 
 
+} // namespace Winix
+
+

core/users.h

@@ -1,10 +1,35 @@
 /*
  * This file is a part of Winix
- * and is not publicly distributed
- * 
- * Copyright (c) 2008-2012, Tomasz Sowa
+ * and is distributed under the 2-Clause BSD licence.
+ * Author: Tomasz Sowa <t.sowa@ttmath.org>
+ */
+
+/* 
+ * Copyright (c) 2008-2014, Tomasz Sowa
  * All rights reserved.
  * 
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * 
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ * 
  */
  
 #ifndef headerfile_winix_core_users
@@ -17,6 +42,12 @@
 #include "cur.h"
 #include "db/db.h"
 
+
+namespace Winix
+{
+
+
+
 class SessionManager;
 
 
@@ -71,7 +102,7 @@ private:
 
 
 
-
+} // namespace Winix