backend update to 23.04.000.214

Author: “Martin

backend/src/c/xmlback/Makefile

@@ -9,7 +9,7 @@
 #                                                                                                                                                                                                                                                                  #
 ####################################################################################################################################################################################################################################################################
 #
-CFLAGS	= '-DEMM_VERSION="OpenEMM 23.04.000.199"' -I. -I../lib -Iinclude
+CFLAGS	= '-DEMM_VERSION="OpenEMM 23.04.000.214"' -I. -I../lib -Iinclude
 LDFLAGS	= -L. -L../lib -Llib
 LIBS	= -lagn -lslang -lopendkim -lbsd -lresolv -llua -lmpack -lssl -lcrypto -lxml2 -lz -lm
 SRCS	= entity.c xmlback.c parse.c create.c replace.c modify.c protect.c convert.c append.c \

backend/src/script/lib/config.sh

@@ -523,7 +523,7 @@ PATH="`$pathstrip -s \"$PATH\"`"
 export PATH
 #
 if [ "$CLASSPATH" ] ; then
-	CLASSPATH="`$pathstrip \"$CLASSPATH\"`"
+	CLASSPATH="`$pathstrip -cb \"$CLASSPATH\"`"
 	export CLASSPATH
 fi
 #

backend/src/script/tools/EMT_lib/ApplicationStatusMenu.py

@@ -425,7 +425,14 @@ def sendConfigAndLogsAction(actionParameters):
 		if len(password) > 0:
 			print("Creating config and logs data zip file. This may take a moment.")
 
-			applicationUserName = Environment.getApplicationUserName()
+			if EMTUtilities.hasRootPermissions():
+				if Environment.applicationName == "OpenEMM":
+					applicationUserName = "openemm"
+				else:
+					applicationUserName = "console"
+			else:
+				applicationUserName = Environment.username
+
 			applicationUserTempDirectory = "/home/" + applicationUserName + "/temp"
 			if not os.path.isdir(applicationUserTempDirectory):
 				EMTUtilities.createDirectory(applicationUserTempDirectory, applicationUserName)

backend/src/script/tools/EMT_lib/Environment.py

@@ -24,7 +24,7 @@ class Environment:
 	# OpenEMM and EMM specific settings start here #
 	################################################
 
-	toolVersion = "23.04.032"
+	toolVersion = "23.04.033"
 	toolName = None
 
 	applicationName = None

backend/src/script/tools/EMT_lib/SupplementalMenu.py

@@ -8,6 +8,7 @@
 #        You should have received a copy of the GNU Affero General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.                                                                                                            #
 #                                                                                                                                                                                                                                                                  #
 ####################################################################################################################################################################################################################################################################
+import sys
 import os
 import shutil
 import subprocess
@@ -133,6 +134,11 @@ def restartMenuAction(actionParameters):
 	else:
 		Environment.messages.append("Restart canceled")
 
+def restartEMT(actionParameters):
+	print(Colors.YELLOW + "Restarting EMT: " + str(Environment.scriptFilePath) + Colors.DEFAULT)
+	os.execl(sys.executable, Environment.scriptFilePath, *sys.argv)
+	sys.exit(0)
+
 def dbTableFormatCheckMenuAction(actionParameters):
 	print(Environment.applicationName + "MariaDB table format check")
 	print("Check database table format and set 'ROW_FORMAT = DYNAMIC'? (N/y, Blank => Cancel):")

backend/src/script/tools/OMT.py

@@ -35,7 +35,7 @@ def configureTool():
 
 	# OpenEMM at GitHub: https://github.com/agnitas-org/OpenEMM
 	Environment.applicationName = "OpenEMM"
-	Environment.scriptFilePath = os.path.dirname(os.path.realpath(__file__))
+	Environment.scriptFilePath = os.path.dirname(os.path.realpath(__file__)) + "/OMT.py"
 
 	if os.path.isfile("/home/" + os.getlogin() + "/.OMT/OMT.override.properties"):
 		customProperty = EMTUtilities.readPropertiesFile("/home/" + os.getlogin() + "/.OMT/OMT.override.properties")