Big load of changes

- Added callback functionality for taskmanager tasks. You can launch
  a task and define a callback function to be run when the task finished.
  This requires activating the cronjob
- Added cron functionality: Add cronjob that calls the cron api every 5
  minutes to use it. (See cron.inc.php)
- Added eventlog
- Added missing translations
- Merged main-menu-login and main-menu-logout

8 files changed, 28 insertions, 27 deletions

diff --git a/lang/en/messages.json b/lang/en/messages.json
index fbec163e..37ca550a 100644
--- a/lang/en/messages.json
+++ b/lang/en/messages.json
@@ -14,9 +14,12 @@
     "error-read": "Error reading {{0}}",
     "error-rename": "Could not rename {{0}} into {{1}}",
     "error-write": "Failed to write {{0}}",
+    "i18n-empty-tag": "A string without tag was submitted",
+    "i18n-invalid-lang": "Invalid language: {{0}}",
     "invalid-action": "Invalid action: {{0}}",
     "invalid-file": "The file {{0}} does not exist!",
     "invalid-ip": "No interface is configured with the address {{0}}",
+    "invalid-path": "Invalid path.",
     "invalid-template": "Selected template is not valid",
     "loginfail": "Username or Password incorrect",
     "missing-file": "There was no file selected!",
@@ -36,6 +39,8 @@
     "taskmanager-error": "Failed to connect to the Task Manager",
     "taskmanager-format": "Task Manager has returned invalid data",
     "token": "Invalid token. CSRF attack?",
+    "unsuccessful-action": "Not successful",
+    "updated-tags": "Tags have been updated",
     "upload-complete": "Upload of {{0}} was successful",
     "upload-failed": "Upload failed: {{0}}",
     "value-invalid": "The value {{1}} is invalid for option {{0}} and has been ignored"
diff --git a/lang/en/settings/cat_setting.json b/lang/en/settings/cat_setting.json
index 4f408f32..8d15df18 100644
--- a/lang/en/settings/cat_setting.json
+++ b/lang/en/settings/cat_setting.json
@@ -3,5 +3,6 @@
     "cat_1": "Inactivity and Shutdown",
     "cat_2": "Internet Access",
     "cat_3": "Time Synchronization",
-    "cat_4": "Basic System"
+    "cat_4": "Basic System",
+    "cat_5": "Common network share"
 }
\ No newline at end of file
diff --git a/lang/en/settings/setting.json b/lang/en/settings/setting.json
index fc857465..68378b9a 100644
--- a/lang/en/settings/setting.json
+++ b/lang/en/settings/setting.json
@@ -1,16 +1,18 @@
 {
     "SLX_ADDONS": "To load addons. There currently only vmware is available.",
-    "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.\n*off* = The internal clock of the computer is not changed.\n*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.\n*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
-    "SLX_LOGOUT_TIMEOUT": "Time \/in seconds\/, in which a user session may remain without action before it is terminated.\nLeave field blank to disable the function.",
+    "SLX_BIOS_CLOCK": "Specifies whether and how the internal clock of the computer should be set in relation to the system time of the \/MiniLinux\/.*off* = The internal clock of the computer is not changed.*local* = The internal clock is set to local time. Preferably if, for example, there is still a native Windows installation available on the PC.*utc* = The internal clock is set to the \/Coordinated Universal Time\/. This is the most common setup in a pure Linux environment.",
+    "SLX_COMMON_SHARE_AUTH": "Athentication method for the common network share. *guest* means no authentication (public share), *user* means the user's credentials will be used.",
+    "SLX_COMMON_SHARE_PATH": "Path of network share. Supported are NFS (no authentication only) and CIFS\/SMB (with and without authentication).",
+    "SLX_LOGOUT_TIMEOUT": "Time \/in seconds\/, in which a user session may remain without action before it is terminated.Leave field blank to disable the function.",
     "SLX_NET_DOMAIN": "DNS domain in which the client integrate, provided the DHCP server does not specifies such.",
-    "SLX_NTP_SERVER": "Address of the NTP time server. Multiple servers can be specified separated by spaces.\nThe servers are queried in sequence until a responding server is found.",
+    "SLX_NTP_SERVER": "Address of the NTP time server. Multiple servers can be specified separated by spaces.The servers are queried in sequence until a responding server is found.",
     "SLX_PROXY_BLACKLIST": "Address or addresses ranges in which the proxy server is not used (for example the address range of the device). Valid entries are individual IP addresses and IP ranges in CIDR notation (for example 1.2.0.0\/16). Multiple selections can be separated by spaces.",
     "SLX_PROXY_IP": "The address to use for the proxy server.",
-    "SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.\n*off* = do not use a Proxy.\n*on* = Always use proxy.\n*auto* = Only use proxy when the client PC is in a private address space.",
+    "SLX_PROXY_MODE": "Determines whether a proxy server is required to access the Internet.*off* = do not use a Proxy.*on* = Always use proxy.*auto* = Only use proxy when the client PC is in a private address space.",
     "SLX_PROXY_PORT": "The port to use for the proxy server.",
-    "SLX_PROXY_TYPE": "Type of the proxy.\n*socks4*, *socks5*,\n*http-connect* (HTTP proxy with support from the CONNECT method),\n*http-relay* (Classic HTTP proxy)",
-    "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.\n*yes* = login with user ID\n*anonymous* = anonymous login\n*no* = no login",
-    "SLX_ROOT_PASS": "The root password of the basic system. Only required for diagnostic purposes on the client.\nLeave field blank to disallow root logins.\n\/Hint\/: The password is encrypted with $6$ hash, so it is no longer readable after saving!",
-    "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.\nSeveral times can be specified, separated by spaces.",
-    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.\nLeave blank to disable the function."
+    "SLX_PROXY_TYPE": "Type of the proxy.*socks4*, *socks5*,*http-connect* (HTTP proxy with support from the CONNECT method),*http-relay* (Classic HTTP proxy)",
+    "SLX_REMOTE_LOG_SESSIONS": "Determines whether logins and logouts of the users should be reported to the satellite.*yes* = login with user ID*anonymous* = anonymous login*no* = no login",
+    "SLX_ROOT_PASS": "The root password of the basic system. Only required for diagnostic purposes on the client.Leave field blank to disallow root logins.\/Hint\/: The password is encrypted with $6$ hash, so it is no longer readable after saving!",
+    "SLX_SHUTDOWN_SCHEDULE": "Fixed time to turn off the computer, even if there is a user active.Several times can be specified, separated by spaces.",
+    "SLX_SHUTDOWN_TIMEOUT": "Time in seconds after which a computer is switched off, if no user is logged on.Leave blank to disable the function."
 }
\ No newline at end of file
diff --git a/lang/en/templates/main-menu-login.json b/lang/en/templates/main-menu-login.json
deleted file mode 100644
index 26391c9f..00000000
--- a/lang/en/templates/main-menu-login.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "lang_administration": "Translations",
-    "lang_client": "Client",
-    "lang_clientLog": "Client Log",
-    "lang_configurationBasic": "Basic Configuration",
-    "lang_configurationVariables": "Configuration Variables",
-    "lang_language": "Language",
-    "lang_localization": "Localization",
-    "lang_login": "Login",
-    "lang_news": "News",
-    "lang_server": "Server",
-    "lang_settings": "Settings",
-    "lang_vmLocation": "VM Location"
-}
\ No newline at end of file
diff --git a/lang/en/templates/main-menu-logout.json b/lang/en/templates/main-menu.json
index 54d7831e..16e83084 100644
--- a/lang/en/templates/main-menu-logout.json
+++ b/lang/en/templates/main-menu.json
@@ -6,9 +6,11 @@
     "lang_configurationVariables": "Configuration Variables",
     "lang_language": "Language",
     "lang_localization": "Localization",
+    "lang_login": "Login",
     "lang_logout": "Logout",
     "lang_news": "News",
     "lang_server": "Server",
     "lang_settings": "Settings",
-    "lang_vmLocation": "VM Location"
+    "lang_vmLocation": "VM Location",
+    "lang_warning": "Warning"
 }
\ No newline at end of file
diff --git a/lang/en/templates/sysconfig/_page.json b/lang/en/templates/sysconfig/_page.json
index 679514c2..e6c643a0 100644
--- a/lang/en/templates/sysconfig/_page.json
+++ b/lang/en/templates/sysconfig/_page.json
@@ -1,6 +1,6 @@
 {
     "lang_activate": "Activate",
-    "lang_active": "",
+    "lang_active": "Active",
     "lang_availableModules": "Available Configuration Modules",
     "lang_availableSystem": "Available System Configuration",
     "lang_close": "Close",
diff --git a/lang/en/templates/translation/edit.json b/lang/en/templates/translation/edit.json
index ff3f44ca..05c6697a 100644
--- a/lang/en/templates/translation/edit.json
+++ b/lang/en/templates/translation/edit.json
@@ -7,6 +7,6 @@
     "lang_newTAG": "New TAG",
     "lang_portugueseTAG": "Portuguese TAG",
     "lang_save": "Save",
-    "lang_templateAdminHelp": "",
+    "lang_templateAdminHelp": "Here you can translate and edit phrases and texts.",
     "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template."
 }
\ No newline at end of file
diff --git a/lang/en/templates/translation/template-list.json b/lang/en/templates/translation/template-list.json
new file mode 100644
index 00000000..e3feb70b
--- /dev/null
+++ b/lang/en/templates/translation/template-list.json
@@ -0,0 +1,5 @@
+{
+    "lang_adminInfo": "This is a list of all templates. The \u0022status\u0022-column tells if there are translations missing, or unused tags are defined.",
+    "lang_langAdministration": "Templates",
+    "lang_status": "Status"
+}
\ No newline at end of file