]> granicus.if.org Git - ejabberd/commitdiff
Fix check_from/2 formatting
authorRadosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com>
Tue, 20 May 2014 11:30:52 +0000 (12:30 +0100)
committerRadosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com>
Tue, 20 May 2014 11:31:28 +0000 (12:31 +0100)
src/ejabberd_c2s.erl

index 0abb4a384294bda7f79e46642a236abeae59ee0e..f3201ed0e2bb6ab2d5d799dfb98d13e2f35a7a16 100644 (file)
@@ -2458,23 +2458,27 @@ is_ip_blacklisted({IP, _Port}) ->
 %% returns invalid-from|NewElement
 check_from(El, FromJID) ->
     case xml:get_tag_attr(<<"from">>, El) of
-      false -> El;
-      {value, SJID} ->
-         JID = jlib:string_to_jid(SJID),
-         case JID of
-           error -> 'invalid-from';
-           #jid{} ->
-               if (JID#jid.luser == FromJID#jid.luser) and
-                    (JID#jid.lserver == FromJID#jid.lserver)
-                    and (JID#jid.lresource == FromJID#jid.lresource) ->
-                      El;
-                  (JID#jid.luser == FromJID#jid.luser) and
-                    (JID#jid.lserver == FromJID#jid.lserver)
-                    and (JID#jid.lresource == <<"">>) ->
-                      El;
-                  true -> 'invalid-from'
-               end
-         end
+       false ->
+           El;
+       {value, SJID} ->
+           JID = jlib:string_to_jid(SJID),
+           case JID of
+               error ->
+                   'invalid-from';
+               #jid{} ->
+                   if
+                       (JID#jid.luser == FromJID#jid.luser) and
+                       (JID#jid.lserver == FromJID#jid.lserver) and
+                       (JID#jid.lresource == FromJID#jid.lresource) ->
+                           El;
+                       (JID#jid.luser == FromJID#jid.luser) and
+                       (JID#jid.lserver == FromJID#jid.lserver) and
+                       (JID#jid.lresource == <<"">>) ->
+                           El;
+                       true ->
+                           'invalid-from'
+                   end
+           end
     end.
 
 fsm_limit_opts(Opts) ->