print components versions in uname winix function

winixd/functions/run.cpp

@@ -1,4 +1,3 @@
-
 /*
  * This file is a part of Winix
  * and is distributed under the 2-Clause BSD licence.

winixd/html/fun_uname.html

@@ -2,7 +2,16 @@
 
 <h1>{uname_header}</h1>
 
-<p>Winix [sys_ver_major].[sys_ver_minor].[sys_ver_revision]</p>
+<p>Winix [if user_super_user][sys_ver_major].[sys_ver_minor].[sys_ver_revision][end]</p>
+
+<h2>{uname_components}</h2>
+
+<ul class="uk-list">
+	<li>pikotools [if user_super_user][sys_pikotools_ver_major].[sys_pikotools_ver_minor].[sys_pikotools_ver_patch][end]</li>
+	<li>morm [if user_super_user][sys_morm_ver_major].[sys_morm_ver_minor].[sys_morm_ver_patch][end]</li>
+	<li>ezc [if user_super_user][sys_ezc_ver_major].[sys_ezc_ver_minor].[sys_ezc_ver_patch][end]</li>
+	<li>tito [if user_super_user][sys_tito_ver_major].[sys_tito_ver_minor].[sys_tito_ver_patch][end]</li>
+</ul>
 
 [if sys_plugin_tab]
 

winixd/locale/en

@@ -515,7 +515,8 @@ subject_header = Edit subject
 tinymce_update_button = Update
 tinymce_update_progressbar_img_alt = Progressbar
 
-uname_header = Uname
+uname_header = System
+uname_components = Components
 uname_available_plugins = Available plugins
 uname_plugin_unknown = Plugin has not set its name
 

winixd/locale/pl

@@ -533,7 +533,8 @@ subject_header = Zmień tytuł
 tinymce_update_button = Aktualizuj
 tinymce_update_progressbar_img_alt = Progressbar
 
-uname_header = Nazwa systemu
+uname_header = System
+uname_components = Komponenty
 uname_available_plugins = Dostępne pluginy
 uname_plugin_unknown = Plugin nie ustawił swojej nazwy
 

winixd/templates/sys.cpp

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2018, Tomasz Sowa
+ * Copyright (c) 2008-2022, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -35,6 +35,10 @@
 #include "templates.h"
 #include "core/request.h"
 #include "core/version.h"
+#include "pikotools/version.h"
+#include "ezc.h"
+#include "tito.h"
+
 
 
 namespace Winix
@@ -66,6 +70,83 @@ void sys_ver_revision(Info & i)
 
 
 
+void sys_pikotools_ver_major(Info & i)
+{
+	i.out << PIKOTOOLS_VERSION_MAJOR;
+}
+
+
+void sys_pikotools_ver_minor(Info & i)
+{
+	i.out << PIKOTOOLS_VERSION_MINOR;
+}
+
+
+void sys_pikotools_ver_patch(Info & i)
+{
+	i.out << PIKOTOOLS_VERSION_PATCH;
+}
+
+
+
+void sys_morm_ver_major(Info & i)
+{
+	i.out << MORM_VERSION_MAJOR;
+}
+
+
+void sys_morm_ver_minor(Info & i)
+{
+	i.out << MORM_VERSION_MINOR;
+}
+
+
+void sys_morm_ver_patch(Info & i)
+{
+	i.out << MORM_VERSION_PATCH;
+}
+
+
+
+void sys_ezc_ver_major(Info & i)
+{
+	i.out << EZC_VERSION_MAJOR;
+}
+
+
+void sys_ezc_ver_minor(Info & i)
+{
+	i.out << EZC_VERSION_MINOR;
+}
+
+
+void sys_ezc_ver_patch(Info & i)
+{
+	i.out << EZC_VERSION_PATCH;
+}
+
+
+
+void sys_tito_ver_major(Info & i)
+{
+	i.out << TITO_VERSION_MAJOR;
+}
+
+
+void sys_tito_ver_minor(Info & i)
+{
+	i.out << TITO_VERSION_MINOR;
+}
+
+
+void sys_tito_ver_patch(Info & i)
+{
+	i.out << TITO_VERSION_PATCH;
+}
+
+
+
+
 static size_t sys_plugin_index = 0;
 
 

winixd/templates/templates.cpp

@@ -513,6 +513,18 @@ void Templates::CreateFunctions()
 	ezc_functions.Insert("sys_ver_major",            sys_ver_major);
 	ezc_functions.Insert("sys_ver_minor",            sys_ver_minor);
 	ezc_functions.Insert("sys_ver_revision",         sys_ver_revision);
+	ezc_functions.Insert("sys_pikotools_ver_major",  sys_pikotools_ver_major);
+	ezc_functions.Insert("sys_pikotools_ver_minor",  sys_pikotools_ver_minor);
+	ezc_functions.Insert("sys_pikotools_ver_patch",  sys_pikotools_ver_patch);
+	ezc_functions.Insert("sys_morm_ver_major",       sys_morm_ver_major);
+	ezc_functions.Insert("sys_morm_ver_minor",       sys_morm_ver_minor);
+	ezc_functions.Insert("sys_morm_ver_patch",       sys_morm_ver_patch);
+	ezc_functions.Insert("sys_ezc_ver_major",       sys_ezc_ver_major);
+	ezc_functions.Insert("sys_ezc_ver_minor",       sys_ezc_ver_minor);
+	ezc_functions.Insert("sys_ezc_ver_patch",       sys_ezc_ver_patch);
+	ezc_functions.Insert("sys_tito_ver_major",       sys_tito_ver_major);
+	ezc_functions.Insert("sys_tito_ver_minor",       sys_tito_ver_minor);
+	ezc_functions.Insert("sys_tito_ver_patch",       sys_tito_ver_patch);
 	ezc_functions.Insert("sys_plugin_tab",           sys_plugin_tab);
 	ezc_functions.Insert("sys_plugin_tab_has_name",  sys_plugin_tab_has_name);
 	ezc_functions.Insert("sys_plugin_tab_name",      sys_plugin_tab_name);

winixd/templates/templates.h

@@ -5,7 +5,7 @@
  */
 
 /* 
- * Copyright (c) 2008-2021, Tomasz Sowa
+ * Copyright (c) 2008-2022, Tomasz Sowa
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
@@ -436,6 +436,18 @@ namespace TemplatesFunctions
 	void sys_ver_major(Info & i);
 	void sys_ver_minor(Info & i);
 	void sys_ver_revision(Info & i);
+	void sys_pikotools_ver_major(Info & i);
+	void sys_pikotools_ver_minor(Info & i);
+	void sys_pikotools_ver_patch(Info & i);
+	void sys_morm_ver_major(Info & i);
+	void sys_morm_ver_minor(Info & i);
+	void sys_morm_ver_patch(Info & i);
+	void sys_ezc_ver_major(Info & i);
+	void sys_ezc_ver_minor(Info & i);
+	void sys_ezc_ver_patch(Info & i);
+	void sys_tito_ver_major(Info & i);
+	void sys_tito_ver_minor(Info & i);
+	void sys_tito_ver_patch(Info & i);
 	void sys_plugin_tab(Info & i);
 	void sys_plugin_tab_has_name(Info & i);
 	void sys_plugin_tab_name(Info & i);