clean subscriptions handling and avoid function_clause

src/mod_pubsub.erl

@@ -1302,7 +1302,8 @@ remove_user(User, Server) ->
 									  [NodeId,
 									   Entity,
 									   JID,
-									   all])
+									   all]);
+							  (_) -> ok
 						      end,
 						      Subscriptions),
 					{result, Affiliations} =

src/mod_pubsub_odbc.erl

@@ -952,7 +952,8 @@ remove_user(User, Server) ->
 									  [NodeId,
 									   Entity,
 									   JID,
-									   all])
+									   all]);
+							  (_) -> ok
 						      end,
 						      Subscriptions),
 					{result, Affiliations} =

src/node_hometree_odbc.erl

@@ -788,15 +788,8 @@ get_entity_subscriptions(Host, Owner) ->
 				      case decode_subscriptions(S) of
 					[] -> [{Node, none, Jid} | Acc];
 					Subs ->
-					    lists:foldl(fun ({Sub, SubId},
-							     Acc2) ->
-								[{Node, Sub,
-								  SubId, Jid}
-								 | Acc2];
-							    (Sub, Acc2) ->
-								[{Node, Sub,
-								  Jid}
-								 | Acc2]
+					    lists:foldl(fun ({Sub, SubId}, Acc2) ->
+								[{Node, Sub, SubId, Jid} | Acc2]
 							end,
 							Acc, Subs)
 				      end