showdb fixed

scripts/sc

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh 
 #
 # $Id$
 #
@@ -974,30 +974,27 @@ case $1 in
 
 
 	showdb|userdb)
-		if [ $# -ne 2 ] ; then
-			usage
-			exit 1
-		fi
 		shift
-		set_user $1
-		is_user
-		if [ $? -ne 0 ] ; then
-			echo non-existent user
-			exit 1;
-		fi
-
-		QUERY1="select $SUB_TABLE.$EMAIL_COLUMN from $SUB_TABLE where  \
-			$SUB_TABLE.$SUBSCRIBER_COLUMN='$SERUSER' and $SUB_TABLE.$REALM_COLUMN='$SERDOMAIN' "
-		QUERY2="select $UL_TABLE.* from $UL_TABLE where \
-			$UL_TABLE.$USER_COLUMN='$1' order by expires desc"
-		QUERY3="select $UL_TABLE.$USER_COLUMN, $SUB_TABLE.$EMAIL_COLUMN, $UL_TABLE.$CALLID_COLUMN \
-			from $SUB_TABLE, $UL_TABLE where  \
-			$SUB_TABLE.$SUBSCRIBER_COLUMN=$UL_TABLE.$USER_COLUMN  order by $UL_TABLE.$USER_COLUMN" 
-
 		if [ $# -eq 1 ] ; then
+			set_user $1
+			is_user
+			if [ $? -ne 0 ] ; then
+				echo non-existent user
+				exit 1;
+			fi
+			QUERY1="select $SUB_TABLE.$EMAIL_COLUMN from $SUB_TABLE \
+					where $SUB_TABLE.$SUBSCRIBER_COLUMN='$SERUSER' and \
+					$SUB_TABLE.$REALM_COLUMN='$SERDOMAIN' "
+			QUERY2="select $UL_TABLE.* from $UL_TABLE where \
+					$UL_TABLE.$USER_COLUMN='$SERUSER' and 
+					$UL_TABLE.$REALM_COLUMN='$SERDOMAIN' order by expires desc"
 			sql_ro_query "$QUERY1"
 			sql_ro_query "$QUERY2"
 		else
+			QUERY3="select $UL_TABLE.$USER_COLUMN, $SUB_TABLE.$EMAIL_COLUMN, \
+				$UL_TABLE.$CALLID_COLUMN from $SUB_TABLE, $UL_TABLE where  \
+				$SUB_TABLE.$SUBSCRIBER_COLUMN=$UL_TABLE.$USER_COLUMN  \
+				order by $UL_TABLE.$USER_COLUMN" 
 			sql_ro_query "$QUERY3"
 		fi
 		echo "Note: Due to usage of cache, server's list " \