--- mcore-src/trunk/mcore-tools/daemon/include/sessionauth.global.class	2011/03/10 18:08:47	1639
+++ mcore-src/trunk/mcore-tools/daemon/include/sessionauth.global.class	2011/03/10 18:10:08	1640
@@ -50,44 +50,6 @@
 
 }
 
-## validate_auth $user $pass
-#validate_auth()
-#{
-#	local user="$1"
-#	local pass="$2"
-#	local dbuser
-#
-#	# return 0 if ${valid_auth=yes} - user alread authenticated
-#	validate_session && return 0
-#
-#	if [[ ${DEBUG} = 1 ]]
-#	then
-#		echo "user=${user}" >> /root/lala.log
-#		echo "pass=${pass}" >> /root/lala.log
-#		echo "mysqldo \"select user from control_auth where pass=MD5('${pass}')\"" >> /root/lala.log
-#		echo $(mysqldo "select user from control_auth where pass=MD5('${pass}')") >> /root/lala.log
-#	fi
-#
-#	dbuser=$(mysqldo "select user from control_auth where pass=MD5('${pass}')")
-#	if [[ ! -z ${dbuser} ]]
-#	then
-#		# check if the returned username is equal the given one
-#		if [[ ${dbuser} = ${user} ]]
-#		then
-#			# register a valid session
-#			echo "auth valid"
-#			export valid_session=yes
-#			return 0
-#		fi
-#	fi
-#
-#	# if we get here, the auth is invalid
-#	echo "auth invalid"
-#	export valid_session=no
-#	return 1
-#}
-
-
 validate_auth()
 {
 	local user="$1"
@@ -101,7 +63,7 @@
 
 	if [[ ! -f ${PASSWD} ]]
 	then
-		echo "passwd '${PASSWD}' does not exist!"
+		eecho "passwd '${PASSWD}' does not exist!"
 		return 1
 	fi
 
@@ -112,17 +74,17 @@
 	then
 		if [[ $(md5crypt ${pass}) == ${passwdpass} ]]
 		then
-			echo "password for user '${user}' is valid!"
+			mecho "password for user '${user}' is valid!"
 			mecho "Successfully logged in. Type 'help' for more information."
 			export valid_session="yes"
 			return 0
 		else
-			echo "password for user '${user}' is invalid!"
+			mecho "password for user '${user}' is invalid!"
 			export valid_session="no"
 			return 1
 		fi
 	else
-		echo "User '${user}' unkown."
+		eecho "User '${user}' unkown."
 		export valid_session="no"
 		return 1
 	fi
@@ -142,7 +104,7 @@
 {
 	if [[ ${valid_session} != yes ]]
 	then
-		echo "not logged in..."
+		eecho "not logged in..."
 		# export quit signal
 		export run=quit
 	fi