changed version to 0.7.2

warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]

winixd/Makefile

@@ -27,7 +27,7 @@ endif
 #	CXX = g++-4.8
 
 ifndef CXXFLAGS
-CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++17 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
+CXXFLAGS = -Wall -O0 -g -fPIC -pthread -std=c++20 -I/usr/local/include -I/usr/include/postgresql -DEZC_HAS_SPECIAL_STREAM
 endif
 
 ifndef AR

winixd/core/basethread.cpp

@@ -254,6 +254,7 @@ void * BaseThread::StartRoutine(void * this_object)
 		}
 	}
 
+	base->save_log();
 	pthread_exit(0);
 	return 0;
 }

winixd/core/filelog.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,6 +58,10 @@ public:
 
 	void set_synchro(Synchro * synchro);
 
+	// using PT::FileLog::init to suppress clang warning:
+	// warning: 'Winix::FileLog::init' hides overloaded virtual function [-Woverloaded-virtual]
+	using PT::FileLog::init;
+
 	void init(const std::wstring & log_file, bool log_stdout, int log_level, bool save_each_line, size_t log_time_zone_id);
 
 	void set_time_zones(TimeZones * time_zones);

winixd/core/image.cpp

@@ -581,6 +581,8 @@ void Image::CreateImage()
 				<< ", 'convert' process returned: " << res << logend;
 		}
 	}
+
+	log << logsave;
 }
 
 

winixd/core/mounts.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2009-2018, Tomasz Sowa
+ * Copyright (c) 2009-2021, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -222,6 +222,11 @@ void Mounts::ReadMounts(const std::wstring & mounts)
 	mount_parser.Parse(mounts, mount_tab);
 
 	CalcCurMount();
+
+	// IMPROVE ME
+	// cur->mount is pointing to the empty mount (it is set in functions.cpp in CheckSpecialFile method)
+	// may would be better to call WINIX_FSTAB_CHANGED after the cur->mount is set?
+	// some plugins are using 'cur' object
 	plugin->Call((Session*)0, WINIX_FSTAB_CHANGED);
 }
 

winixd/core/threadmanager.cpp

@@ -186,6 +186,10 @@ void ThreadManager::StopAll()
 		item.object->WaitForThread();
 		log << log4 << "TM: thread " << id << " terminated" << logend;
 
+		// the thread is stopped and we can set the thread log buffer pointing to
+		// the main log buffer (from the main thread)
+		item.object->set_log_buffer(log.GetLogBuffer());
+
 		delete item.thread_item_data;
 		id += 1;
 	}

winixd/core/timezone.cpp

@@ -259,7 +259,7 @@ bool TimeZone::SetTzDst(PT::Space & year)
 
 	int year_int = Toi(year.name);
 
-	if( year_int < 1970 && year_int > 10000 )
+	if( year_int < 1970 || year_int > 10000 )
 		return false;
 
 	dst.has_dst = year.Bool(L"has_dst", false);

winixd/core/version.h

@@ -42,7 +42,7 @@ namespace Winix
 
 #define WINIX_VER_MAJOR		0
 #define WINIX_VER_MINOR		7
-#define WINIX_VER_REVISION	1
+#define WINIX_VER_REVISION	2
 
 
 

winixd/core/winixbase.cpp

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -90,6 +90,13 @@ void WinixBase::set_dependency(WinixBase * winix_base)
 
 
 
+void WinixBase::save_log()
+{
+	log << logsave;
+}
+
+
+
 }
 
 

winixd/core/winixbase.h

@@ -5,7 +5,7 @@
  */
 
 /*
- * Copyright (c) 2018, Tomasz Sowa
+ * Copyright (c) 2018-2021, Tomasz Sowa
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,6 +65,8 @@ public:
 
 	void set_dependency(WinixBase * winix_base);
 
+	void save_log();
+
 
 protected:
 

winixd/functions/functions.cpp

@@ -168,7 +168,9 @@ Error Functions::CheckSpecialFile(const Item & item)
 	{
 		log << log3 << "Functions: reloading mount points" << logend;
 
+		cur->mount = system->mounts.GetEmptyMount();
 		system->mounts.ReadMounts(item.content);
+		cur->mount = system->mounts.pmount;
 		templates->ReadNewIndexTemplates();
 		templates->ReadNewChangeTemplates();
 

winixd/html/fun_imgcrop.html

@@ -74,11 +74,11 @@
 [else]
 
 	[if item_tab]
-		<table class="uk-table uk-table-responsive uk-table-divider uk-table-justify" data-uk-lightbox="animation: slide">
+		<table class="uk-table uk-table-responsive uk-table-divider uk-table-justify">
 			[for item_tab]
 				<tr>
 
-					<td>
+					<td data-uk-lightbox="animation: slide">
 						<a href="[item_tab_link]">
 							<img src="[item_tab_link][if item_tab_has_thumb]/-/thumb[end]" alt="[item_tab_subject]">
 						</a>

winixd/html/fun_ipban.html

@@ -4,7 +4,7 @@
 
 [if ipban_tab]
 
-	<table class="ipban_table">
+	<table class="uk-table uk-table-divider uk-table-small">
 
 	<tr>
 		<th>{ipban_col_id}</th>
@@ -35,15 +35,15 @@
 		<td>[if ipban_tab_has_active_flag]{ipban_has_active_flag}[end]</td>
 		<td>[ipban_tab_last_used]</td>
 		<td>[ipban_tab_expires]</td>
-		<td><a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
+		<td><a class="uk-button uk-button-default uk-button-small" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:[ipban_tab_ip]">{ipban_remove_ip}</a></td>
 	</tr>
 
 	[end]
 	</table>
 
-	<p>
+	<div class="uk-margin">
-		<a href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
+		<a class="uk-button uk-button-default" href="[doc_base_url][dir][if item_is][item_url]/[end]ipban/removeip:all">{ipban_remove_all_ip}</a>
-	</p>
+	</div>
 
 [else]
 	<p>{ipban_ban_list_empty}</p>

winixd/html/fun_last.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1 class="simple">{last_header}</h1>
+<h1>{last_header}</h1>
 
 [if last_tab]
-	<table>
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr><th>{last_tab_login}</th><th>{last_tab_ip}</th><th>{last_tab_login_date}</th><th>{last_tab_logout_date}</th></tr>
 	[for last_tab]
 		<tr><td>[last_tab_name]</td><td>[last_tab_ip]</td><td>[last_tab_start]</td><td>[last_tab_end]</td></tr>

winixd/html/fun_man.html

@@ -4,29 +4,23 @@
 
 <h2>{man_winix_funcions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_winixfun_tab]
-	<tr>
+	<li>[man_winixfun_tab_name]</li>
-	<td>[man_winixfun_tab_index]</td>
-	<td>[man_winixfun_tab_name]</td>
-	</tr>
 [end]
 
-</table>
+</ul>
 
 
 <h2>{man_ezc_functions}</h2>
 
-<table>
+<ul class="uk-list uk-list-disc">
 
 [for man_ezcfun_tab]
-	<tr>
+	<li>[man_ezcfun_tab_name]</li>
-	<td>[man_ezcfun_tab_index]</td>
-	<td>[man_ezcfun_tab_name]</td>
-	</tr>
 [end]
 
-</table>
+</ul>
 
 </div>

winixd/html/fun_pw.html

@@ -1,9 +1,9 @@
 <div class="winix">
 
-<h1>Pw</h1>
+<h1>{pw_header}</h1>
 
 [if user_tab]
-	<table class="tablec">
+	<table class="uk-table uk-table-divider uk-table-small uk-table-responsive">
 	<tr>
 	<th>{pw_table_no}</th>
 	<th>{pw_table_login}</th>
@@ -14,7 +14,7 @@
 	</tr>
 	
 	[for user_tab]
-		<tr class="[if index "odd"]roweven[else]rowodd[end]">
+		<tr>
 		<td>[user_tab_index]</td>
 		<td>[user_tab_name]</td>
 		<td>[if user_tab_is_super_user]{pw_table_yes}[end]</td>

winixd/html/fun_rmuser.html

@@ -4,18 +4,20 @@
 
 [if user_logged]
 
-	<form id="additem" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir][if item_is][item_url]/[end]rmuser">
-	<fieldset>
-		<legend>{rmuser_legend}</legend>
 
 		[if user_super_user]
 
-			<p class="withnext">{rmuser_selectuser}:</p>
+			<div class="uk-margin">
-			<select name="userid">
+				<label class="uk-form-label" for="winix_select_user_id">{rmuser_selectuser}</label>
-			[for user_tab]
+				<div class="uk-form-controls">
-				<option value="[user_tab_id]">[user_tab_name]</option>
+					<select class="uk-select uk-width-1-2@s" id="winix_select_user_id" name="userid">
-			[end]
+					[for user_tab]
-			</select>
+						<option value="[user_tab_id]">[user_tab_name]</option>
+					[end]
+					</select>
+				</div>
+			</div>
 		
 		[else]
 			<p>{rmuser_removecurrent}</p>
@@ -26,8 +28,10 @@
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 		
-		<input type="submit" value="{rmuser_submit}">
+		<div class="uk-margin">
-	</fieldset>
+			<input class="uk-button uk-button-primary" type="submit" value="{rmuser_submit}">
+		</div>
+
 	</form>
 
 [end]

winixd/html/fun_stat.html

@@ -2,7 +2,7 @@
 
 <h1 class="simple">{stat_header}</h1>
 
-<table class="withoutborder">
+<table class="uk-table uk-table-small uk-table-divider uk-width-1-2@m">
 
 <tr><th>{stat_item_type}:</th>	<td>
 [if stat_item_type_is_file]{stat_item_type_file}[end]

winixd/html/fun_thread.html

@@ -6,7 +6,7 @@
 [end]
 
 [if not [thread_mount_arg_is "sort_desc"]]
-	<div class="winix_threadbox">
+	<div class="uk-margin">
 		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]
@@ -36,7 +36,7 @@
 
 
 [if thread_mount_arg_is "sort_desc"]
-	<div class="winix_threadbox">
+	<div class="uk-margin">
 		[if item_can_write]<a class="uk-button uk-button-default uk-button-small" href="[item_link]/emacs" rel="nofollow">{edit}</a>[end]
 		[if thread_mount_arg_is "subject"]<h2[if thread_mount_arg_is "info"] class="winix_withinfo"[end]>[item_subject]</h2>[end]
 		[if thread_mount_arg_is "info"][include "item_info.html"][end]

winixd/html/fun_uname.html

@@ -6,11 +6,12 @@
 
 [if sys_plugin_tab]
 
-	{uname_available_plugins}:
+	<h2>{uname_available_plugins}</h2>
-	<ul>
+
-	
+	<ul class="uk-list">
+
 	[for sys_plugin_tab]
-	<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
+		<li>[if sys_plugin_tab_has_name][sys_plugin_tab_name][else]&lt;{uname_plugin_unknown}&gt;[end]</li>
 	[end]
 
 	</ul>

winixd/html/index.html

@@ -4,7 +4,7 @@
 <html lang="{winix_html_lang_attr}">
 
 <head>
-	[include "index_head_functions_add.html"]
+	[include "index_head_adder.html"]
 	<title>[doc_title]</title>
 </head>
 

winixd/html/index_generic.html

@@ -4,7 +4,7 @@
 <html lang="{winix_html_lang_attr}">
 
 <head>
-	[include "index_head_functions_add.html"]
+	[include "index_head_adder.html"]
 	<title>[doc_title]</title>
 </head>
 

winixd/html/index_head_adder.html

@@ -1,6 +1,3 @@
-[# rename me to index_head_adder.html]
-
-
 [def winix_has_uikit "true"]
 [def winix_has_jquery "false"]
 

winixd/html/item_options.html

@@ -1,39 +0,0 @@
-[if not [winix_function_param_is "fullscreen"]]
-[if dir_can_write item_can_write]
-	<div class="winix_itemoptions_a">
-	
-		[if dir_can_write]
-			<h2>{add_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir]emacs">{admin_emacs_add}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir]ckeditor">{admin_ckeditor_add}</a></li>
-				<li><a href="[doc_base_url][dir]nicedit">{admin_nicedit_add}</a></li>
-				<li><a href="[doc_base_url][dir]tinymce">{admin_tinymce_add}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		[if item_is item_can_write]
-			<h2>{edit_page}</h2>
-			<ul>
-			<li><a href="[doc_base_url][dir][item_url]/emacs">{admin_emacs_edit}</a></li>
-			[if user_can_use_html]
-				<li><a href="[doc_base_url][dir][item_url]/ckeditor">{admin_ckeditor_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/nicedit">{admin_nicedit_edit}</a></li>
-				<li><a href="[doc_base_url][dir][item_url]/tinymce">{admin_tinymce_edit}</a></li>
-			[end]
-			</ul>
-		[end]
-	
-		<h2>{admin_options}:</h2>
-		<ul>
-		<li><a href="[doc_base_url][dir]ls">{admin_ls}</a></li>
-		[if dir_can_write]<li><a href="[doc_base_url][dir]mkdir">{admin_mkdir}</a></li>[end]
-		[if dir_can_write]<li><a href="[doc_base_url][dir]upload">{admin_upload}</a></li>[end]
-		[if not item_is]<li><a href="[doc_base_url][dir]sort">{admin_sort}</a></li>[end]
-		[if any item_is item_can_remove]<li><a href="[doc_base_url][dir][item_url]/rm">{admin_rm}</a></li>[end]
-		</ul>
-	</div>
-[end]
-[end]

winixd/locale/en

@@ -258,7 +258,8 @@ pw_table_is_active = Is active
 pw_table_is_suspended = Is suspended
 pw_table_is_banned = Is banned
 pw_table_yes = yes
-pw_table_no = no
+
+# !! is it used anymore?
 pw_password_changed = Your password has been changed
 
 
@@ -288,8 +289,7 @@ rm_content_use_r_option = Content of a directory can be removed only with 'r' pa
 
 
 rmuser_header = Remove user
-rmuser_legend = Remove user form
+rmuser_selectuser = Choose a user to delete
-rmuser_selectuser = Select a user
 rmuser_submit = Remove
 rmuser_removecurrent = Are you really want to remove your account from our service? 
 

winixd/locale/pl

@@ -280,7 +280,8 @@ pw_table_is_active = Aktywny
 pw_table_is_suspended = Wstrzymany
 pw_table_is_banned = Zbanowany
 pw_table_yes = tak
-pw_table_no = nie
+
+# !! is it used anymore?
 pw_password_changed = Twoje hasło zostało zmienione
 
 
@@ -309,8 +310,7 @@ rm_cannot_remove_root_dir = Nie możesz usunąć głównego katalogu
 rm_content_use_r_option = Zawartość katalogu może zostać usunięta tylko z użyciem parametru 'r'
 
 rmuser_header = Usuń użytkownika
-rmuser_legend = Formularz usunięcia użytkownika
+rmuser_selectuser = Wybierz użytkownika do usunięcia
-rmuser_selectuser = Wybierz użytkownika
 rmuser_submit = Usuń
 rmuser_removecurrent = Naprawdę chcesz usunąć swoje konto z naszego serwisu?