--- mcore-src/trunk/mcore-tools/daemon/include/daemon.global.class	2011/02/02 20:20:24	1248
+++ mcore-src/trunk/mcore-tools/daemon/include/daemon.global.class	2014/01/10 12:02:07	2140
@@ -1,22 +1,56 @@
 # $Id$
 
-# import_resource $table $serial $resource $value
-import_resource()
+# loads client classes from $MCORE_LIBDIR
+load_client_classes()
 {
-	local table="$1"
-	local serial="$2"
-	local resource="$3"
-	local value="$4"
+	local i
 
-	if [[ ${DEBUG} = 1 ]]
-	then
-		echo "${table}->${resource}=${value}" >> /root/lala.log
-		echo "mysqldo \"update ${table} set ${resource}='${value}' where serial=${serial};\"" >> /root/lala.log
-	fi
+	# client specific
+	for i in $(find ${MCORE_LIBDIR}/include -type f -name \*.client.class)
+	do
+		source ${i} || eecho "error loading ${i}"
+	done
+}
 
-	mysql_insert "${table}",serial="${serial}","${resource}"="${value}"
+# restarts the whole service via remote cmd
+restart_service()
+{
+	local pid
+	for pid in $(pidof sslsvd)
+	do
+		kill -SIGHUP ${pid}
+	done
 }
 
+# stops the whole service via remote cmd
+stop_service()
+{
+	local pid
+	for pid in $(pidof sslsvd)
+	do
+		kill -15 ${pid}
+		sleep 1
+		kill -9 ${pid}
+	done
+}
+
+# # import_resource $table $serial $resource $value
+# import_resource()
+# {
+# 	local table="$1"
+# 	local serial="$2"
+# 	local resource="$3"
+# 	local value="$4"
+# 
+# 	if [[ ${DEBUG} = 1 ]]
+# 	then
+# 		echo "${table}->${resource}=${value}" >> /root/lala.log
+# 		echo "mysqldo \"update ${table} set ${resource}='${value}' where serial=${serial};\"" >> /root/lala.log
+# 	fi
+# 
+# 	mysql_insert "${table}",serial="${serial}","${resource}"="${value}"
+# }
+
 # run_class $method $caller $argv1 $argv2 ... $argvN
 run_class()
 {
@@ -26,7 +60,7 @@
 	local cmd
 	local argv
 
-	if validate_session
+	if valid_session
 	then
 		class="${caller%.*}"
 		cmd="${caller#*.}"
@@ -44,7 +78,7 @@
 		then
 			"${method}"_"${class}"_"${cmd}" ${argv}
 		else
- 			echo "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
+ 			eecho "unkown method '${method}' . class '${class}' . cmd '${cmd}'"
 		fi
 	else
 		invalid_session
@@ -58,12 +92,21 @@
 
 	topics=$(typeset -f | grep '^help_' | sed 's:help_\(.*\)\ .*():\1:' | sed 's:_:\.:' | sort)
 	mecho "Global commands:"
-	mecho "\timport  - import settings to database"
-	mecho "\tget     - shows current value for a settings"
-	mecho "\tset     - sets value for a setting"
-	mecho "\tauth    - authenticate to the daemon"
-	mecho "\tprovide - shows provides of a system"
-	mecho "\thelp    - shows help"
+	mecho "\timport   - import settings to database"
+	mecho "\tget      - shows current value for a settings"
+	mecho "\tset      - sets value for a setting"
+	mecho "\tauth     - authenticate to the daemon"
+	mecho "\tprovide  - shows provides of a system"
+	mecho "\trequire  - verify plugin requirements"
+	mecho "\treload   - reloads all client classes plugins"
+	mecho "\trestart  - restarts the daemon"
+	mecho "\tstop     - stops the daemon"
+	mecho "\tnocolors - disable colors, useful for the webclient"
+	mecho "\tcolors   - enable colors"
+	mecho "\tquiet    - do not print any unecessary messages"
+	mecho "\thelp     - shows help"
+	mecho "\tversion  - prints version of the daemon"
+	mecho "\tquit     - quits the connection to the server"
 	mecho
 	mecho "Help topics:"
 	for i in ${topics}
@@ -75,38 +118,8 @@
 
 		mecho "\t${i}"
 	done
-}
-
-# on newer xorg-servers root is not allowed to run progs in a user session
-x11runas()
-{
-	su - "${MCORE_UNPRIV_USER}" -c "$@"
-}
-
-addconfig()
-{
-	if [[ -z ${CONFIG} ]]
-	then
-		echo "You must define \$CONFIG varibale first!"
-		return 1
-	fi
-
-	if [[ ! -d $(dirname ${CONFIG}) ]]
-	then
-		install -d $(dirname ${CONFIG})
-	fi
-	echo "$@" >> ${CONFIG}
-}
-
-clearconfig()
-{
-	if [[ -z ${CONFIG} ]]
-	then
-		echo "You must define \$CONFIG varibale first!"
-		return 1
-	fi
-
-	: > ${CONFIG}
+	mecho
+	mecho "Type 'help [topic]' for more information about every topic."
 }
 
 require()
@@ -116,21 +129,59 @@
 
 	for i in ${requires}
 	do
-		export REQUIRE="${REQUIRE} ${i}"
+		# check for duplicate provides
+		if no_duplicate "${PROVIDE}" "${i}"
+		then
+			export REQUIRE="${REQUIRE} ${i}"
+		else
+			decho "duplicate provide '${i}' detected!" 
+		fi
 	done
 }
 
-not_provided()
+verify_requirements()
 {
-	local i
-	local item="$1"
+	local req
+	local prov
+	local missing
+	local sorted
 
-	for i in ${PROVIDE}
+	for req in ${REQUIRE}
 	do
-		[[ ${i} = ${item} ]] && return 1
+		# scan PROVIDE for dupes
+		# if a dupe is found, then requirement is fullfilled
+		# else add to missing
+		if no_duplicate "${PROVIDE}" "${req}"
+		then
+			missing="${missing} ${req}"
+		fi
 	done
 
-	return 0
+	# sort them alpabetically
+	sorted=$(for i in ${REQUIRE}; do echo "${i}"; done | sort)
+
+	# show missing and set the right retval
+	if [[ -z ${missing} ]]
+	then
+		# do not escape, or CRLFS get printed to screen too
+		rvecho ${sorted}
+		return 0
+	else
+		for req in ${sorted}
+		do
+			if no_duplicate "${missing}" "$req"
+			then
+				# print normal
+				rvecho -n "${req} "
+			else
+				# print missing
+				eecho -n "${req} "
+			fi
+		done
+		# print CRLF
+		echo
+		return 1
+	fi
 }
 
 provide()
@@ -141,11 +192,11 @@
 	for i in ${provides}
 	do
 		# check for duplicate provides
-		if not_provided "${i}"
+		if no_duplicate "${PROVIDE}" "${i}"
 		then
 			export PROVIDE="${PROVIDE} ${i}"
 		else
-			[[ ${DEBUG} = 1 ]] && echo "duplicate provide '${i}' detected!" 
+			decho "duplicate provide '${i}' detected!" 
 		fi
 	done
 }
@@ -157,18 +208,37 @@
 	# sort them alpabetically
 	sorted=$(for i in ${PROVIDE}; do echo "${i}"; done | sort)
 	# do not escape, or CRLFS get printed to screen too
-	mecho ${sorted}	
+	rvecho ${sorted}
+}
+
+help_daemon_mroot()
+{
+	mecho "get daemon.mroot"
+	mecho " Prints current MROOT variable."
+	mecho
+	mecho "set daemon.mroot [path]"
+	mecho " set MROOT variable to given path."
 }
 
-mecho()
+get_daemon_mroot()
 {
-	local COLCYAN="\033[1;36m"
-	local COLDEFAULT="\033[0m"
-	if [[ ${NOCOLORS} = true ]]
+	rvecho "${MROOT}"
+}
+
+set_daemon_mroot()
+{
+	local path=$1
+
+	if [[ -d ${path} ]]
 	then
-		COLCYAN=""
-		COLDEFAULT=""
+		export MROOT="${path}"
+		decho "MROOT='${MROOT}' is set."
+	else
+		eecho "Path '${path}' does not exist. MROOT not set."
 	fi
+}
 
-	echo -e "${COLCYAN}$@${COLDEFAULT}"
+print_version()
+{
+	echo "mcored-$(<${MCORE_LIBDIR}/VERSION)"
 }