]> granicus.if.org Git - ejabberd/commitdiff
mod_http_upload: Make case indentation consistent
authorHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 9 Nov 2015 18:23:52 +0000 (19:23 +0100)
committerHolger Weiss <holger@zedat.fu-berlin.de>
Mon, 9 Nov 2015 18:23:52 +0000 (19:23 +0100)
Use four spaces (or the corresponding amount of tab characters) for case
indentation everywhere in mod_http_upload and mod_http_upload_quota.

src/mod_http_upload.erl
src/mod_http_upload_quota.erl

index e5b9d52253c8525e3b94e1e8f0cbcc5f3308b31b..a0cefde50eb95a8f25028eb2ee8f9e02e23fb35b 100644 (file)
@@ -136,12 +136,13 @@ start(ServerHost, Opts) ->
     case gen_mod:get_opt(rm_on_unregister, Opts,
                         fun(B) when is_boolean(B) -> B end,
                         true) of
-      true ->
-         ejabberd_hooks:add(remove_user, ServerHost, ?MODULE,
-                            remove_user, 50),
-         ejabberd_hooks:add(anonymous_purge_hook, ServerHost, ?MODULE,
-                            remove_user, 50);
-      false -> ok
+       true ->
+           ejabberd_hooks:add(remove_user, ServerHost, ?MODULE,
+                              remove_user, 50),
+           ejabberd_hooks:add(anonymous_purge_hook, ServerHost, ?MODULE,
+                              remove_user, 50);
+       false ->
+           ok
     end,
     Proc = get_proc_name(ServerHost, ?PROCNAME),
     Spec = {Proc,
@@ -158,12 +159,13 @@ stop(ServerHost) ->
     case gen_mod:get_module_opt(ServerHost, ?MODULE, rm_on_unregister,
                                fun(B) when is_boolean(B) -> B end,
                                true) of
-      true ->
-         ejabberd_hooks:delete(remove_user, ServerHost, ?MODULE,
-                               remove_user, 50),
-         ejabberd_hooks:delete(anonymous_purge_hook, ServerHost, ?MODULE,
-                               remove_user, 50);
-      false -> ok
+       true ->
+           ejabberd_hooks:delete(remove_user, ServerHost, ?MODULE,
+                                 remove_user, 50),
+           ejabberd_hooks:delete(anonymous_purge_hook, ServerHost, ?MODULE,
+                                 remove_user, 50);
+       false ->
+           ok
     end,
     Proc = get_proc_name(ServerHost, ?PROCNAME),
     supervisor:terminate_child(ejabberd_sup, Proc),
@@ -273,34 +275,34 @@ init({ServerHost, Opts}) ->
                                fun(B) when is_boolean(B) -> B end,
                                true),
     case ServiceURL of
-      undefined ->
-         ok;
-      <<"http://", _/binary>> ->
-         application:start(inets);
-      <<"https://", _/binary>> ->
-         application:start(inets),
-         application:start(crypto),
-         application:start(asn1),
-         application:start(public_key),
-         application:start(ssl)
+       undefined ->
+           ok;
+       <<"http://", _/binary>> ->
+           application:start(inets);
+       <<"https://", _/binary>> ->
+           application:start(inets),
+           application:start(crypto),
+           application:start(asn1),
+           application:start(public_key),
+           application:start(ssl)
     end,
     case DirMode of
-      undefined ->
-         ok;
-      Mode ->
-         file:change_mode(DocRoot, Mode)
+       undefined ->
+           ok;
+       Mode ->
+           file:change_mode(DocRoot, Mode)
     end,
     case Thumbnail of
-      true ->
-         case string:str(os:cmd("identify"), "Magick") of
-           0 ->
-               ?ERROR_MSG("Cannot find 'identify' command, please install "
-                          "ImageMagick or disable thumbnail creation", []);
-           _ ->
-               ok
-         end;
-      false ->
-         ok
+       true ->
+           case string:str(os:cmd("identify"), "Magick") of
+             0 ->
+                 ?ERROR_MSG("Cannot find 'identify' command, please install "
+                            "ImageMagick or disable thumbnail creation", []);
+             _ ->
+                 ok
+           end;
+       false ->
+           ok
     end,
     ejabberd_router:register_route(Host),
     {ok, #state{server_host = ServerHost, host = Host, name = Name,
@@ -325,14 +327,14 @@ handle_call({use_slot, Slot}, _From, #state{file_mode = FileMode,
                                            thumbnail = Thumbnail,
                                            docroot = DocRoot} = State) ->
     case get_slot(Slot, State) of
-      {ok, {Size, Timer}} ->
-         timer:cancel(Timer),
-         NewState = del_slot(Slot, State),
-         Path = str:join([DocRoot | Slot], <<$/>>),
-         {reply, {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail},
-          NewState};
-      error ->
-         {reply, {error, <<"Invalid slot">>}, State}
+       {ok, {Size, Timer}} ->
+           timer:cancel(Timer),
+           NewState = del_slot(Slot, State),
+           Path = str:join([DocRoot | Slot], <<$/>>),
+           {reply, {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail},
+            NewState};
+       error ->
+           {reply, {error, <<"Invalid slot">>}, State}
     end;
 handle_call(get_docroot, _From, #state{docroot = DocRoot} = State) ->
     {reply, {ok, DocRoot}, State};
@@ -351,12 +353,12 @@ handle_cast(Request, State) ->
 handle_info({route, From, To, #xmlel{name = <<"iq">>} = Stanza}, State) ->
     Request = jlib:iq_query_info(Stanza),
     {Reply, NewState} = case process_iq(From, Request, State) of
-                         R when is_record(R, iq) ->
-                             {R, State};
-                         {R, S} ->
-                             {R, S};
-                         not_request ->
-                             {none, State}
+                           R when is_record(R, iq) ->
+                               {R, State};
+                           {R, S} ->
+                               {R, S};
+                           not_request ->
+                               {none, State}
                        end,
     if Reply /= none ->
            ejabberd_router:route(To, From, jlib:iq_to_xml(Reply));
@@ -395,77 +397,77 @@ process(LocalPath, #request{method = 'PUT', host = Host, ip = IP,
                            data = Data}) ->
     Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
     case catch gen_server:call(Proc, {use_slot, LocalPath}) of
-      {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail}
-         when byte_size(Data) == Size ->
-         ?DEBUG("Storing file from ~s for ~s: ~s",
-                [?ADDR_TO_STR(IP), Host, Path]),
-         case store_file(Path, Data, FileMode, DirMode,
-                         GetPrefix, LocalPath, Thumbnail) of
-             ok ->
-                 http_response(Host, 201);
-             {ok, Headers, OutData} ->
-                 http_response(Host, 201, Headers, OutData);
-             {error, Error} ->
-                 ?ERROR_MSG("Cannot store file ~s from ~s for ~s: ~p",
-                            [Path, ?ADDR_TO_STR(IP), Host, Error]),
-                 http_response(Host, 500)
-         end;
-      {ok, Size, Path} ->
-         ?INFO_MSG("Rejecting file ~s from ~s for ~s: Size is ~B, not ~B",
-                   [Path, ?ADDR_TO_STR(IP), Host, byte_size(Data), Size]),
-         http_response(Host, 413);
-      {error, Error} ->
-         ?INFO_MSG("Rejecting file from ~s for ~s: ~p",
-                   [?ADDR_TO_STR(IP), Host, Error]),
-         http_response(Host, 403);
-      Error ->
-         ?ERROR_MSG("Cannot handle PUT request from ~s for ~s: ~p",
-                    [?ADDR_TO_STR(IP), Host, Error]),
-         http_response(Host, 500)
+       {ok, Size, Path, FileMode, DirMode, GetPrefix, Thumbnail}
+           when byte_size(Data) == Size ->
+           ?DEBUG("Storing file from ~s for ~s: ~s",
+                  [?ADDR_TO_STR(IP), Host, Path]),
+           case store_file(Path, Data, FileMode, DirMode,
+                           GetPrefix, LocalPath, Thumbnail) of
+               ok ->
+                   http_response(Host, 201);
+               {ok, Headers, OutData} ->
+                   http_response(Host, 201, Headers, OutData);
+               {error, Error} ->
+                   ?ERROR_MSG("Cannot store file ~s from ~s for ~s: ~p",
+                              [Path, ?ADDR_TO_STR(IP), Host, Error]),
+                   http_response(Host, 500)
+           end;
+       {ok, Size, Path} ->
+           ?INFO_MSG("Rejecting file ~s from ~s for ~s: Size is ~B, not ~B",
+                     [Path, ?ADDR_TO_STR(IP), Host, byte_size(Data), Size]),
+           http_response(Host, 413);
+       {error, Error} ->
+           ?INFO_MSG("Rejecting file from ~s for ~s: ~p",
+                     [?ADDR_TO_STR(IP), Host, Error]),
+           http_response(Host, 403);
+       Error ->
+           ?ERROR_MSG("Cannot handle PUT request from ~s for ~s: ~p",
+                      [?ADDR_TO_STR(IP), Host, Error]),
+           http_response(Host, 500)
     end;
 process(LocalPath, #request{method = Method, host = Host, ip = IP})
     when Method == 'GET';
         Method == 'HEAD' ->
     Proc = gen_mod:get_module_proc(Host, ?PROCNAME),
     case catch gen_server:call(Proc, get_docroot) of
-      {ok, DocRoot} ->
-         Path = str:join([DocRoot | LocalPath], <<$/>>),
-         case file:read_file(Path) of
-           {ok, Data} ->
-               ?INFO_MSG("Serving ~s to ~s", [Path, ?ADDR_TO_STR(IP)]),
-               FileName = lists:last(LocalPath),
-               ContentType = guess_content_type(FileName),
-               Headers1 = case ContentType of
-                            <<"image/", _SubType/binary>> -> [];
-                            <<"text/", _SubType/binary>> -> [];
-                            _ ->
-                                [{<<"Content-Disposition">>,
-                                  <<"attachment; filename=",
-                                    $", FileName/binary, $">>}]
-                          end,
-               Headers2 = [{<<"Content-Type">>, ContentType} | Headers1],
-               http_response(Host, 200, Headers2, Data);
-           {error, eacces} ->
-               ?INFO_MSG("Cannot serve ~s to ~s: Permission denied",
-                         [Path, ?ADDR_TO_STR(IP)]),
-               http_response(Host, 403);
-           {error, enoent} ->
-               ?INFO_MSG("Cannot serve ~s to ~s: No such file",
-                         [Path, ?ADDR_TO_STR(IP)]),
-               http_response(Host, 404);
-           {error, eisdir} ->
-               ?INFO_MSG("Cannot serve ~s to ~s: Is a directory",
-                         [Path, ?ADDR_TO_STR(IP)]),
-               http_response(Host, 404);
-           {error, Error} ->
-               ?INFO_MSG("Cannot serve ~s to ~s: ~s",
-                         [Path, ?ADDR_TO_STR(IP), ?FORMAT(Error)]),
-               http_response(Host, 500)
-         end;
-      Error ->
-         ?ERROR_MSG("Cannot handle ~s request from ~s for ~s: ~p",
-                    [Method, ?ADDR_TO_STR(IP), Host, Error]),
-         http_response(Host, 500)
+       {ok, DocRoot} ->
+           Path = str:join([DocRoot | LocalPath], <<$/>>),
+           case file:read_file(Path) of
+               {ok, Data} ->
+                   ?INFO_MSG("Serving ~s to ~s", [Path, ?ADDR_TO_STR(IP)]),
+                   FileName = lists:last(LocalPath),
+                   ContentType = guess_content_type(FileName),
+                   Headers1 = case ContentType of
+                                <<"image/", _SubType/binary>> -> [];
+                                <<"text/", _SubType/binary>> -> [];
+                                _ ->
+                                    [{<<"Content-Disposition">>,
+                                      <<"attachment; filename=",
+                                        $", FileName/binary, $">>}]
+                              end,
+                   Headers2 = [{<<"Content-Type">>, ContentType} | Headers1],
+                   http_response(Host, 200, Headers2, Data);
+               {error, eacces} ->
+                   ?INFO_MSG("Cannot serve ~s to ~s: Permission denied",
+                             [Path, ?ADDR_TO_STR(IP)]),
+                   http_response(Host, 403);
+               {error, enoent} ->
+                   ?INFO_MSG("Cannot serve ~s to ~s: No such file",
+                             [Path, ?ADDR_TO_STR(IP)]),
+                   http_response(Host, 404);
+               {error, eisdir} ->
+                   ?INFO_MSG("Cannot serve ~s to ~s: Is a directory",
+                             [Path, ?ADDR_TO_STR(IP)]),
+                   http_response(Host, 404);
+               {error, Error} ->
+                   ?INFO_MSG("Cannot serve ~s to ~s: ~s",
+                             [Path, ?ADDR_TO_STR(IP), ?FORMAT(Error)]),
+                   http_response(Host, 500)
+           end;
+       Error ->
+           ?ERROR_MSG("Cannot handle ~s request from ~s for ~s: ~p",
+                      [Method, ?ADDR_TO_STR(IP), Host, Error]),
+           http_response(Host, 500)
     end;
 process(_LocalPath, #request{method = 'OPTIONS', host = Host, ip = IP}) ->
     ?DEBUG("Responding to OPTIONS request from ~s for ~s",
@@ -525,31 +527,33 @@ process_iq(From,
     when XMLNS == ?NS_HTTP_UPLOAD;
         XMLNS == ?NS_HTTP_UPLOAD_OLD ->
     case acl:match_rule(ServerHost, Access, From) of
-      allow ->
-         case parse_request(SubEl, Lang) of
-           {ok, File, Size, ContentType} ->
-               case create_slot(State, From, File, Size, ContentType, Lang) of
-                 {ok, Slot} ->
-                     {ok, Timer} = timer:send_after(?SLOT_TIMEOUT,
-                                                    {slot_timed_out, Slot}),
-                     NewState = add_slot(Slot, Size, Timer, State),
-                     SlotEl = slot_el(Slot, State, XMLNS),
-                     {IQ#iq{type = result, sub_el = [SlotEl]}, NewState};
-                 {ok, PutURL, GetURL} ->
-                     SlotEl = slot_el(PutURL, GetURL, XMLNS),
-                     IQ#iq{type = result, sub_el = [SlotEl]};
-                 {error, Error} ->
-                     IQ#iq{type = error, sub_el = [SubEl, Error]}
-               end;
-           {error, Error} ->
-               ?DEBUG("Cannot parse request from ~s",
-                      [jlib:jid_to_string(From)]),
-               IQ#iq{type = error, sub_el = [SubEl, Error]}
-         end;
-      deny ->
-         ?DEBUG("Denying HTTP upload slot request from ~s",
-                [jlib:jid_to_string(From)]),
-         IQ#iq{type = error, sub_el = [SubEl, ?ERR_FORBIDDEN]}
+       allow ->
+           case parse_request(SubEl, Lang) of
+               {ok, File, Size, ContentType} ->
+                   case create_slot(State, From, File, Size, ContentType,
+                                    Lang) of
+                       {ok, Slot} ->
+                           {ok, Timer} = timer:send_after(?SLOT_TIMEOUT,
+                                                          {slot_timed_out,
+                                                           Slot}),
+                           NewState = add_slot(Slot, Size, Timer, State),
+                           SlotEl = slot_el(Slot, State, XMLNS),
+                           {IQ#iq{type = result, sub_el = [SlotEl]}, NewState};
+                       {ok, PutURL, GetURL} ->
+                           SlotEl = slot_el(PutURL, GetURL, XMLNS),
+                           IQ#iq{type = result, sub_el = [SlotEl]};
+                       {error, Error} ->
+                           IQ#iq{type = error, sub_el = [SubEl, Error]}
+                   end;
+               {error, Error} ->
+                   ?DEBUG("Cannot parse request from ~s",
+                          [jlib:jid_to_string(From)]),
+                   IQ#iq{type = error, sub_el = [SubEl, Error]}
+           end;
+       deny ->
+           ?DEBUG("Denying HTTP upload slot request from ~s",
+                  [jlib:jid_to_string(From)]),
+           IQ#iq{type = error, sub_el = [SubEl, ?ERR_FORBIDDEN]}
     end;
 process_iq(_From, #iq{sub_el = SubEl} = IQ, _State) ->
     IQ#iq{type = error, sub_el = [SubEl, ?ERR_NOT_ALLOWED]};
@@ -563,25 +567,25 @@ process_iq(_From, invalid, _State) ->
 
 parse_request(#xmlel{name = <<"request">>, attrs = Attrs} = Request, Lang) ->
     case xml:get_attr(<<"xmlns">>, Attrs) of
-      {value, XMLNS} when XMLNS == ?NS_HTTP_UPLOAD;
-                         XMLNS == ?NS_HTTP_UPLOAD_OLD ->
-         case {xml:get_subtag_cdata(Request, <<"filename">>),
-               xml:get_subtag_cdata(Request, <<"size">>),
-               xml:get_subtag_cdata(Request, <<"content-type">>)} of
-           {File, SizeStr, ContentType} when byte_size(File) > 0 ->
-               case catch jlib:binary_to_integer(SizeStr) of
-                 Size when is_integer(Size), Size > 0 ->
-                     {ok, File, Size, yield_content_type(ContentType)};
-                 _ ->
-                     Text = <<"Please specify file size.">>,
-                     {error, ?ERRT_BAD_REQUEST(Lang, Text)}
-               end;
-           _ ->
-               Text = <<"Please specify file name.">>,
-               {error, ?ERRT_BAD_REQUEST(Lang, Text)}
-         end;
-      _ ->
-         {error, ?ERR_BAD_REQUEST}
+       {value, XMLNS} when XMLNS == ?NS_HTTP_UPLOAD;
+                           XMLNS == ?NS_HTTP_UPLOAD_OLD ->
+           case {xml:get_subtag_cdata(Request, <<"filename">>),
+                 xml:get_subtag_cdata(Request, <<"size">>),
+                 xml:get_subtag_cdata(Request, <<"content-type">>)} of
+               {File, SizeStr, ContentType} when byte_size(File) > 0 ->
+                   case catch jlib:binary_to_integer(SizeStr) of
+                       Size when is_integer(Size), Size > 0 ->
+                           {ok, File, Size, yield_content_type(ContentType)};
+                       _ ->
+                           Text = <<"Please specify file size.">>,
+                           {error, ?ERRT_BAD_REQUEST(Lang, Text)}
+                   end;
+               _ ->
+                   Text = <<"Please specify file name.">>,
+                   {error, ?ERRT_BAD_REQUEST(Lang, Text)}
+           end;
+       _ ->
+           {error, ?ERR_BAD_REQUEST}
     end;
 parse_request(_El, _Lang) -> {error, ?ERR_BAD_REQUEST}.
 
@@ -606,16 +610,16 @@ create_slot(#state{service_url = undefined,
     UserDir = <<DocRoot/binary, $/, UserStr/binary>>,
     case ejabberd_hooks:run_fold(http_upload_slot_request, ServerHost, allow,
                                 [JID, UserDir, Size, Lang]) of
-      allow ->
-         RandStr = make_rand_string(SecretLength),
-         FileStr = make_file_string(File),
-         ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
-                   [jlib:jid_to_string(JID), File]),
-         {ok, [UserStr, RandStr, FileStr]};
-      deny ->
-         {error, ?ERR_SERVICE_UNAVAILABLE};
-      #xmlel{} = Error ->
-         {error, Error}
+       allow ->
+           RandStr = make_rand_string(SecretLength),
+           FileStr = make_file_string(File),
+           ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
+                     [jlib:jid_to_string(JID), File]),
+           {ok, [UserStr, RandStr, FileStr]};
+       deny ->
+           {error, ?ERR_SERVICE_UNAVAILABLE};
+       #xmlel{} = Error ->
+           {error, Error}
     end;
 create_slot(#state{service_url = ServiceURL},
            #jid{luser = U, lserver = S} = JID, File, Size, ContentType,
@@ -629,37 +633,38 @@ create_slot(#state{service_url = ServiceURL},
                     "&size=" ++ ?URL_ENC(SizeStr) ++
                     "&content_type=" ++ ?URL_ENC(ContentType),
     case httpc:request(get, {GetRequest, []}, HttpOptions, Options) of
-      {ok, {Code, Body}} when Code >= 200, Code =< 299 ->
-         case binary:split(Body, <<$\n>>, [global, trim]) of
-           [<<"http", _/binary>> = PutURL, <<"http", _/binary>> = GetURL] ->
-               ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
-                         [jlib:jid_to_string(JID), File]),
-               {ok, PutURL, GetURL};
-           Lines ->
-               ?ERROR_MSG("Can't parse data received for ~s from <~s>: ~p",
-                          [jlib:jid_to_string(JID), ServiceURL, Lines]),
-               {error, ?ERR_SERVICE_UNAVAILABLE}
-         end;
-      {ok, {402, _Body}} ->
-         ?INFO_MSG("Got status code 402 for ~s from <~s>",
-                   [jlib:jid_to_string(JID), ServiceURL]),
-         {error, ?ERR_RESOURCE_CONSTRAINT};
-      {ok, {403, _Body}} ->
-         ?INFO_MSG("Got status code 403 for ~s from <~s>",
-                   [jlib:jid_to_string(JID), ServiceURL]),
-         {error, ?ERR_NOT_ALLOWED};
-      {ok, {413, _Body}} ->
-         ?INFO_MSG("Got status code 413 for ~s from <~s>",
-                   [jlib:jid_to_string(JID), ServiceURL]),
-         {error, ?ERR_NOT_ACCEPTABLE};
-      {ok, {Code, _Body}} ->
-         ?ERROR_MSG("Got unexpected status code for ~s from <~s>: ~B",
-                    [jlib:jid_to_string(JID), ServiceURL, Code]),
-         {error, ?ERR_SERVICE_UNAVAILABLE};
-      {error, Reason} ->
-         ?ERROR_MSG("Error requesting upload slot for ~s from <~s>: ~p",
-                    [jlib:jid_to_string(JID), ServiceURL, Reason]),
-         {error, ?ERR_SERVICE_UNAVAILABLE}
+       {ok, {Code, Body}} when Code >= 200, Code =< 299 ->
+           case binary:split(Body, <<$\n>>, [global, trim]) of
+               [<<"http", _/binary>> = PutURL,
+                <<"http", _/binary>> = GetURL] ->
+                   ?INFO_MSG("Got HTTP upload slot for ~s (file: ~s)",
+                             [jlib:jid_to_string(JID), File]),
+                   {ok, PutURL, GetURL};
+               Lines ->
+                   ?ERROR_MSG("Can't parse data received for ~s from <~s>: ~p",
+                              [jlib:jid_to_string(JID), ServiceURL, Lines]),
+                   {error, ?ERR_SERVICE_UNAVAILABLE}
+           end;
+       {ok, {402, _Body}} ->
+           ?INFO_MSG("Got status code 402 for ~s from <~s>",
+                     [jlib:jid_to_string(JID), ServiceURL]),
+           {error, ?ERR_RESOURCE_CONSTRAINT};
+       {ok, {403, _Body}} ->
+           ?INFO_MSG("Got status code 403 for ~s from <~s>",
+                     [jlib:jid_to_string(JID), ServiceURL]),
+           {error, ?ERR_NOT_ALLOWED};
+       {ok, {413, _Body}} ->
+           ?INFO_MSG("Got status code 413 for ~s from <~s>",
+                     [jlib:jid_to_string(JID), ServiceURL]),
+           {error, ?ERR_NOT_ACCEPTABLE};
+       {ok, {Code, _Body}} ->
+           ?ERROR_MSG("Got unexpected status code for ~s from <~s>: ~B",
+                      [jlib:jid_to_string(JID), ServiceURL, Code]),
+           {error, ?ERR_SERVICE_UNAVAILABLE};
+       {error, Reason} ->
+           ?ERROR_MSG("Error requesting upload slot for ~s from <~s>: ~p",
+                      [jlib:jid_to_string(JID), ServiceURL, Reason]),
+           {error, ?ERR_SERVICE_UNAVAILABLE}
     end.
 
 -spec add_slot(slot(), pos_integer(), timer:tref(), state()) -> state().
@@ -811,10 +816,10 @@ do_store_file(Path, Data, FileMode, DirMode) ->
        end,
        ok = Ok % Raise an exception if file:write/2 failed.
     catch
-      _:{badmatch, {error, Error}} ->
-         {error, ?FORMAT(Error)};
-      _:Error ->
-         {error, Error}
+       _:{badmatch, {error, Error}} ->
+           {error, ?FORMAT(Error)};
+       _:Error ->
+           {error, Error}
     end.
 
 -spec guess_content_type(binary()) -> binary().
@@ -852,11 +857,11 @@ http_response(Host, Code, ExtraHeaders, Body) ->
                               end,
                               []),
     Headers = case proplists:is_defined(<<"Content-Type">>, ExtraHeaders) of
-               true ->
-                   [ServerHeader | ExtraHeaders];
-               false ->
-                   [ServerHeader, {<<"Content-Type">>, <<"text/plain">>} |
-                    ExtraHeaders]
+                 true ->
+                     [ServerHeader | ExtraHeaders];
+                 false ->
+                     [ServerHeader, {<<"Content-Type">>, <<"text/plain">>} |
+                      ExtraHeaders]
              end ++ CustomHeaders,
     {Code, Headers, Body}.
 
@@ -972,16 +977,16 @@ del_tree(Dir) ->
        {ok, Entries} = file:list_dir(Dir),
        lists:foreach(fun(Path) ->
                              case filelib:is_dir(Path) of
-                               true ->
-                                   ok = del_tree(Path);
-                               false ->
-                                   ok = file:delete(Path)
+                                 true ->
+                                     ok = del_tree(Path);
+                                 false ->
+                                     ok = file:delete(Path)
                              end
                      end, [Dir ++ "/" ++ Entry || Entry <- Entries]),
        ok = file:del_dir(Dir)
     catch
-      _:{badmatch, {error, Error}} ->
-         {error, ?FORMAT(Error)};
-      _:Error ->
-         {error, Error}
+       _:{badmatch, {error, Error}} ->
+           {error, ?FORMAT(Error)};
+       _:Error ->
+           {error, Error}
     end.
index 8042ffd82f75c2f2c86c5f97eaf9b16313d7d199..c0f138f763fd3d462a7c2aefdb3c189f278523a1 100644 (file)
@@ -161,42 +161,42 @@ handle_cast({handle_slot_request, #jid{user = U, server = S} = JID, Path, Size},
                   access_hard_quota = AccessHardQuota,
                   disk_usage = DiskUsage} = State) ->
     HardQuota = case acl:match_rule(ServerHost, AccessHardQuota, JID) of
-                 Hard when is_integer(Hard), Hard > 0 ->
-                     Hard * 1024 * 1024;
-                 _ ->
-                     0
+                   Hard when is_integer(Hard), Hard > 0 ->
+                       Hard * 1024 * 1024;
+                   _ ->
+                       0
                end,
     SoftQuota = case acl:match_rule(ServerHost, AccessSoftQuota, JID) of
-                 Soft when is_integer(Soft), Soft > 0 ->
-                     Soft * 1024 * 1024;
-                 _ ->
-                     0
+                   Soft when is_integer(Soft), Soft > 0 ->
+                       Soft * 1024 * 1024;
+                   _ ->
+                       0
                end,
     OldSize = case dict:find({U, S}, DiskUsage) of
-               {ok, Value} ->
-                   Value;
-               error ->
-                   undefined
+                 {ok, Value} ->
+                     Value;
+                 error ->
+                     undefined
              end,
     NewSize = case {HardQuota, SoftQuota} of
-               {0, 0} ->
-                   ?DEBUG("No quota specified for ~s",
-                          [jlib:jid_to_string(JID)]),
-                   Size;
-               {0, _} ->
+                 {0, 0} ->
+                     ?DEBUG("No quota specified for ~s",
+                            [jlib:jid_to_string(JID)]),
+                     Size;
+                 {0, _} ->
                      ?WARNING_MSG("No hard quota specified for ~s",
                                   [jlib:jid_to_string(JID)]),
                      enforce_quota(Path, Size, OldSize, SoftQuota, SoftQuota);
-               {_, 0} ->
+                 {_, 0} ->
                      ?WARNING_MSG("No soft quota specified for ~s",
                                   [jlib:jid_to_string(JID)]),
                      enforce_quota(Path, Size, OldSize, HardQuota, HardQuota);
-               _ when SoftQuota > HardQuota ->
+                 _ when SoftQuota > HardQuota ->
                      ?WARNING_MSG("Bad quota for ~s (soft: ~p, hard: ~p)",
                                   [jlib:jid_to_string(JID),
                                    SoftQuota, HardQuota]),
                      enforce_quota(Path, Size, OldSize, SoftQuota, SoftQuota);
-               _ ->
+                 _ ->
                      ?DEBUG("Enforcing quota for ~s",
                             [jlib:jid_to_string(JID)]),
                      enforce_quota(Path, Size, OldSize, SoftQuota, HardQuota)
@@ -214,17 +214,19 @@ handle_info(sweep, #state{server_host = ServerHost,
     when is_integer(MaxDays), MaxDays > 0 ->
     ?DEBUG("Got 'sweep' message for ~s", [ServerHost]),
     case file:list_dir(DocRoot) of
-      {ok, Entries} ->
-         BackThen = secs_since_epoch() - (MaxDays * 86400),
-         DocRootS = binary_to_list(DocRoot),
-         PathNames = lists:map(fun(Entry) -> DocRootS ++ "/" ++ Entry end,
-                               Entries),
-         UserDirs = lists:filter(fun filelib:is_dir/1, PathNames),
-         lists:foreach(fun(UserDir) -> delete_old_files(UserDir, BackThen) end,
-                       UserDirs);
-      {error, Error} ->
-         ?ERROR_MSG("Cannot open document root ~s: ~s",
-                    [DocRoot, ?FORMAT(Error)])
+       {ok, Entries} ->
+           BackThen = secs_since_epoch() - (MaxDays * 86400),
+           DocRootS = binary_to_list(DocRoot),
+           PathNames = lists:map(fun(Entry) ->
+                                         DocRootS ++ "/" ++ Entry
+                                 end, Entries),
+           UserDirs = lists:filter(fun filelib:is_dir/1, PathNames),
+           lists:foreach(fun(UserDir) ->
+                                 delete_old_files(UserDir, BackThen)
+                         end, UserDirs);
+       {error, Error} ->
+           ?ERROR_MSG("Cannot open document root ~s: ~s",
+                      [DocRoot, ?FORMAT(Error)])
     end,
     {noreply, State};
 handle_info(Info, State) ->
@@ -294,14 +296,14 @@ enforce_quota(UserDir, SlotSize, _OldSize, MinSize, MaxSize) ->
 
 -spec delete_old_files(file:filename_all(), integer()) -> ok.
 
-delete_old_files(UserDir, Timestamp) ->
+delete_old_files(UserDir, CutOff) ->
     FileInfo = gather_file_info(UserDir),
-    case [Path || {Path, _Size, Time} <- FileInfo, Time < Timestamp] of
-      [] ->
-         ok;
-      OldFiles ->
-         lists:foreach(fun(File) -> del_file_and_dir(File) end, OldFiles),
-         file:del_dir(UserDir) % In case it's empty, now.
+    case [Path || {Path, _Size, Time} <- FileInfo, Time < CutOff] of
+       [] ->
+           ok;
+       OldFiles ->
+           lists:foreach(fun(File) -> del_file_and_dir(File) end, OldFiles),
+           file:del_dir(UserDir) % In case it's empty, now.
     end.
 
 -spec gather_file_info(file:filename_all())
@@ -311,49 +313,50 @@ gather_file_info(Dir) when is_binary(Dir) ->
     gather_file_info(binary_to_list(Dir));
 gather_file_info(Dir) ->
     case file:list_dir(Dir) of
-      {ok, Entries} ->
-         lists:foldl(fun(Entry, Acc) ->
-                             Path = Dir ++ "/" ++ Entry,
-                             case file:read_file_info(Path, [{time, posix}]) of
-                               {ok, #file_info{type = directory}} ->
-                                   gather_file_info(Path) ++ Acc;
-                               {ok, #file_info{type = regular,
-                                               mtime = Time,
-                                               size = Size}} ->
-                                   [{Path, Size, Time} | Acc];
-                               {ok, _Info} ->
-                                   ?DEBUG("Won't stat(2) non-regular file ~s",
-                                          [Path]),
-                                   Acc;
-                               {error, Error} ->
-                                   ?ERROR_MSG("Cannot stat(2) ~s: ~s",
-                                              [Path, ?FORMAT(Error)]),
-                                   Acc
-                             end
-                     end, [], Entries);
-      {error, enoent} ->
-         ?DEBUG("Directory ~s doesn't exist", [Dir]),
-         [];
-      {error, Error} ->
-         ?ERROR_MSG("Cannot open directory ~s: ~s", [Dir, ?FORMAT(Error)]),
-         []
+       {ok, Entries} ->
+           lists:foldl(fun(Entry, Acc) ->
+                               Path = Dir ++ "/" ++ Entry,
+                               case file:read_file_info(Path,
+                                                        [{time, posix}]) of
+                                   {ok, #file_info{type = directory}} ->
+                                       gather_file_info(Path) ++ Acc;
+                                   {ok, #file_info{type = regular,
+                                                   mtime = Time,
+                                                   size = Size}} ->
+                                       [{Path, Size, Time} | Acc];
+                                   {ok, _Info} ->
+                                       ?DEBUG("Won't stat(2) non-regular file ~s",
+                                              [Path]),
+                                       Acc;
+                                   {error, Error} ->
+                                       ?ERROR_MSG("Cannot stat(2) ~s: ~s",
+                                                  [Path, ?FORMAT(Error)]),
+                                       Acc
+                               end
+                       end, [], Entries);
+       {error, enoent} ->
+           ?DEBUG("Directory ~s doesn't exist", [Dir]),
+           [];
+       {error, Error} ->
+           ?ERROR_MSG("Cannot open directory ~s: ~s", [Dir, ?FORMAT(Error)]),
+           []
     end.
 
 -spec del_file_and_dir(file:name_all()) -> ok.
 
 del_file_and_dir(File) ->
     case file:delete(File) of
-      ok ->
-         ?INFO_MSG("Removed ~s", [File]),
-         Dir = filename:dirname(File),
-         case file:del_dir(Dir) of
-           ok ->
-               ?DEBUG("Removed ~s", [Dir]);
-           {error, Error} ->
-               ?DEBUG("Cannot remove ~s: ~s", [Dir, ?FORMAT(Error)])
-         end;
-      {error, Error} ->
-         ?WARNING_MSG("Cannot remove ~s: ~s", [File, ?FORMAT(Error)])
+       ok ->
+           ?INFO_MSG("Removed ~s", [File]),
+           Dir = filename:dirname(File),
+           case file:del_dir(Dir) of
+               ok ->
+                   ?DEBUG("Removed ~s", [Dir]);
+               {error, Error} ->
+                   ?DEBUG("Cannot remove ~s: ~s", [Dir, ?FORMAT(Error)])
+           end;
+       {error, Error} ->
+           ?WARNING_MSG("Cannot remove ~s: ~s", [File, ?FORMAT(Error)])
     end.
 
 -spec secs_since_epoch() -> non_neg_integer().