]> granicus.if.org Git - ejabberd/commitdiff
Fix formatting
authorRadosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com>
Tue, 20 May 2014 10:54:49 +0000 (11:54 +0100)
committerRadosław Szymczyszyn <radoslaw.szymczyszyn@erlang-solutions.com>
Tue, 20 May 2014 11:26:33 +0000 (12:26 +0100)
src/ejabberd_c2s.erl

index a160a467746a632ed22518c1350626db7d4cee32..723268375f242f1a6da1baee6357c06de9dc1007 100644 (file)
@@ -959,9 +959,7 @@ wait_for_sasl_response(closed, StateData) ->
     {stop, normal, StateData}.
 
 resource_conflict_action(U, S, R) ->
-    OptionRaw = case ejabberd_sm:is_existing_resource(U, S,
-                                                     R)
-                   of
+    OptionRaw = case ejabberd_sm:is_existing_resource(U, S, R) of
                  true ->
                      ejabberd_config:get_option(
                         {resource_conflict, S},
@@ -1082,7 +1080,7 @@ wait_for_session({xmlstreamelement, El}, StateData) ->
                    ?INFO_MSG("(~w) Opened session for ~s",
                              [NewStateData#state.socket,
                               jlib:jid_to_string(JID)]),
-                    Res = jlib:make_result_iq_reply(El#xmlel{children = []}),
+                   Res = jlib:make_result_iq_reply(El#xmlel{children = []}),
                    NewState = send_stanza(NewStateData, Res),
                    change_shaper(NewState, JID),
                    {Fs, Ts} = ejabberd_hooks:run_fold(
@@ -1888,12 +1886,11 @@ new_id() -> randoms:get_string().
 
 is_auth_packet(El) ->
     case jlib:iq_query_info(El) of
-      #iq{id = ID, type = Type, xmlns = ?NS_AUTH,
-         sub_el = SubEl} ->
-         #xmlel{children = Els} = SubEl,
-         {auth, ID, Type,
-          get_auth_tags(Els, <<"">>, <<"">>, <<"">>, <<"">>)};
-      _ -> false
+       #iq{id = ID, type = Type, xmlns = ?NS_AUTH, sub_el = SubEl} ->
+           #xmlel{children = Els} = SubEl,
+           {auth, ID, Type,
+            get_auth_tags(Els, <<"">>, <<"">>, <<"">>, <<"">>)};
+       _ -> false
     end.
 
 is_stanza(#xmlel{name = Name, attrs = Attrs}) when Name == <<"message">>;
@@ -2216,18 +2213,16 @@ remove_element(E, Set) ->
 
 roster_change(IJID, ISubscription, StateData) ->
     LIJID = jlib:jid_tolower(IJID),
-    IsFrom = (ISubscription == both) or
-              (ISubscription == from),
+    IsFrom = (ISubscription == both) or (ISubscription == from),
     IsTo = (ISubscription == both) or (ISubscription == to),
-    OldIsFrom = (?SETS):is_element(LIJID,
-                                  StateData#state.pres_f),
-    FSet = if IsFrom ->
-                 (?SETS):add_element(LIJID, StateData#state.pres_f);
-             true -> remove_element(LIJID, StateData#state.pres_f)
+    OldIsFrom = (?SETS):is_element(LIJID, StateData#state.pres_f),
+    FSet = if
+              IsFrom -> (?SETS):add_element(LIJID, StateData#state.pres_f);
+              not IsFrom -> remove_element(LIJID, StateData#state.pres_f)
           end,
-    TSet = if IsTo ->
-                 (?SETS):add_element(LIJID, StateData#state.pres_t);
-             true -> remove_element(LIJID, StateData#state.pres_t)
+    TSet = if
+              IsTo -> (?SETS):add_element(LIJID, StateData#state.pres_t);
+              not IsTo -> remove_element(LIJID, StateData#state.pres_t)
           end,
     case StateData#state.pres_last of
       undefined ->
@@ -2321,11 +2316,10 @@ process_privacy_iq(From, To,
     NewStateData.
 
 resend_offline_messages(StateData) ->
-    case
-      ejabberd_hooks:run_fold(resend_offline_messages_hook,
-                             StateData#state.server, [],
-                             [StateData#state.user, StateData#state.server])
-       of
+    case ejabberd_hooks:run_fold(resend_offline_messages_hook,
+                                StateData#state.server, [],
+                                [StateData#state.user, StateData#state.server])
+    of
       Rs -> %%when is_list(Rs) ->
          lists:foreach(fun ({route, From, To,
                              #xmlel{} = Packet}) ->
@@ -2345,8 +2339,7 @@ resend_offline_messages(StateData) ->
     end.
 
 resend_subscription_requests(#state{user = User,
-                                   server = Server} =
-                                StateData) ->
+                                   server = Server} = StateData) ->
     PendingSubscriptions =
        ejabberd_hooks:run_fold(resend_subscription_requests_hook,
                                Server, [], [User, Server]),
@@ -2358,11 +2351,9 @@ resend_subscription_requests(#state{user = User,
 
 get_showtag(undefined) -> <<"unavailable">>;
 get_showtag(Presence) ->
-    case xml:get_path_s(Presence,
-                       [{elem, <<"show">>}, cdata])
-       of
-      <<"">> -> <<"available">>;
-      ShowTag -> ShowTag
+    case xml:get_path_s(Presence, [{elem, <<"show">>}, cdata]) of
+       <<"">> -> <<"available">>;
+       ShowTag -> ShowTag
     end.
 
 get_statustag(undefined) -> <<"">>;