Skip to content
Browse files

core: Name controller helper includes consistently

Fixes #413
  • Loading branch information...
1 parent 8159c61 commit 32258d042e01ff384e7f0a07e84ab29a42362eec @arjan arjan committed Dec 4, 2012
Showing with 66 additions and 66 deletions.
  1. +2 −2 doc/manuals/controllers.rst
  2. +7 −7 doc/manuals/upgrading.rst
  3. +2 −2 include/{html_controller.hrl → controller_html_helper.hrl}
  4. 0 include/{webmachine_controller.hrl → controller_webmachine_helper.hrl}
  5. +1 −1 modules/mod_admin/controllers/controller_admin.erl
  6. +1 −1 modules/mod_admin/controllers/controller_admin_edit.erl
  7. +1 −1 modules/mod_admin/controllers/controller_admin_media_preview.erl
  8. +1 −1 modules/mod_admin/controllers/controller_admin_referrers.erl
  9. +1 −1 modules/mod_admin_category/controllers/controller_admin_category_sorter.erl
  10. +1 −1 modules/mod_admin_config/controllers/controller_admin_config.erl
  11. +1 −1 modules/mod_admin_modules/controllers/controller_admin_module_manager.erl
  12. +1 −1 modules/mod_atom/controllers/controller_atom_entry.erl
  13. +1 −1 modules/mod_atom_feed/controllers/controller_atom_feed_cat.erl
  14. +1 −1 modules/mod_atom_feed/controllers/controller_atom_feed_search.erl
  15. +1 −1 modules/mod_authentication/controllers/controller_logoff.erl
  16. +1 −1 modules/mod_authentication/controllers/controller_logon.erl
  17. +1 −1 modules/mod_backup/controllers/controller_admin_backup.erl
  18. +1 −1 modules/mod_backup/controllers/controller_admin_backup_revision.erl
  19. +1 −1 modules/mod_base/controllers/controller_api.erl
  20. +1 −1 modules/mod_base/controllers/controller_close_connection.erl
  21. +1 −1 modules/mod_base/controllers/controller_comet.erl
  22. +1 −1 modules/mod_base/controllers/controller_file_readonly.erl
  23. +1 −1 modules/mod_base/controllers/controller_id.erl
  24. +1 −1 modules/mod_base/controllers/controller_lib.erl
  25. +1 −1 modules/mod_base/controllers/controller_page.erl
  26. +1 −1 modules/mod_base/controllers/controller_postback.erl
  27. +1 −1 modules/mod_base/controllers/controller_redirect.erl
  28. +1 −1 modules/mod_base/controllers/controller_static_pages.erl
  29. +1 −1 modules/mod_base/controllers/controller_template.erl
  30. +1 −1 modules/mod_base/controllers/controller_user_agent_probe.erl
  31. +1 −1 modules/mod_base/controllers/controller_user_agent_select.erl
  32. +1 −1 modules/mod_base/controllers/controller_website_redirect.erl
  33. +1 −1 modules/mod_base/controllers/controller_websocket.erl
  34. +1 −1 modules/mod_comment/controllers/controller_admin_comments.erl
  35. +1 −1 modules/mod_comment/controllers/controller_admin_comments_settings.erl
  36. +1 −1 modules/mod_development/controllers/controller_wmtrace.erl
  37. +1 −1 modules/mod_development/controllers/controller_wmtrace_conf.erl
  38. +1 −1 modules/mod_facebook/controllers/controller_admin_facebook.erl
  39. +1 −1 modules/mod_facebook/controllers/controller_facebook_authorize.erl
  40. +1 −1 modules/mod_facebook/controllers/controller_facebook_redirect.erl
  41. +1 −1 modules/mod_mailinglist/controllers/controller_admin_mailing_preview.erl
  42. +1 −1 modules/mod_mailinglist/controllers/controller_admin_mailing_status.erl
  43. +1 −1 modules/mod_mailinglist/controllers/controller_admin_mailinglist.erl
  44. +1 −1 modules/mod_mailinglist/controllers/controller_admin_mailinglist_recipients.erl
  45. +1 −1 modules/mod_mailinglist/controllers/controller_mailinglist_export.erl
  46. +1 −1 modules/mod_oauth/controllers/controller_oauth_access_token.erl
  47. +1 −1 modules/mod_oauth/controllers/controller_oauth_apps.erl
  48. +1 −1 modules/mod_oauth/controllers/controller_oauth_authorize.erl
  49. +1 −1 modules/mod_oauth/controllers/controller_oauth_request_token.erl
  50. +1 −1 modules/mod_rest/controllers/controller_rest_rsc.erl
  51. +1 −1 modules/mod_seo/controllers/controller_admin_seo.erl
  52. +1 −1 modules/mod_signup/controllers/controller_signup.erl
  53. +1 −1 modules/mod_signup/controllers/controller_signup_confirm.erl
  54. +1 −1 modules/mod_survey/controllers/controller_survey_results.erl
  55. +1 −1 modules/mod_translation/controllers/controller_language_set.erl
  56. +1 −1 modules/mod_twitter/controllers/controller_twitter_authorize.erl
  57. +1 −1 modules/mod_twitter/controllers/controller_twitter_redirect.erl
  58. +1 −1 priv/sites/testsandbox/controllers/controller_test_helloworld.erl
  59. +1 −1 priv/sites/zotonic_status/controllers/controller_zotonic_status.erl
View
4 doc/manuals/controllers.rst
@@ -31,13 +31,13 @@ webmachine callback functions. For instance, when you define a
function ``resource_exists/2``, it will be called to decide whether or
not the page should return a 404 page.
-The simplest controller uses Zotonic's ``html_controller.hrl`` include to serve HTML:
+The simplest controller uses Zotonic's ``controller_html_helper.hrl`` include to serve HTML:
.. code-block:: erlang
-module(controller_example).
- -include_lib("html_controller.hrl").
+ -include_lib("controller_html_helper.hrl").
html(Context) ->
{<<"<h1>Hello</h1>">>, Context}.
View
14 doc/manuals/upgrading.rst
@@ -56,13 +56,13 @@ the new include file names.
The following include files have been renamed:
-+-------------------------------+---------------------------------+
-|Old filename |New filename |
-+-------------------------------+---------------------------------+
-|include/resource_html.hrl |include/html_controller.hrl |
-+-------------------------------+---------------------------------+
-|include/webmachine_resource.hrl|include/webmachine_controller.hrl|
-+-------------------------------+---------------------------------+
++-------------------------------+----------------------------------------+
+|Old filename |New filename |
++-------------------------------+----------------------------------------+
+|include/resource_html.hrl |include/controller_html_helper.hrl |
++-------------------------------+----------------------------------------+
+|include/webmachine_resource.hrl|include/controller_webmachine_helper.hrl|
++-------------------------------+----------------------------------------+
HTTPS support
.............
View
4 include/html_controller.hrl → include/controller_html_helper.hrl
@@ -5,7 +5,7 @@
%%
%% -module(controller_plop).
%% -author("Your Name <me@example.com>").
-%% -include_lib("html_controller.hrl").
+%% -include_lib("controller_html_helper.hrl").
%%
%% html(Context) ->
%% Html = z_template:render("plop.tpl", Context),
@@ -27,7 +27,7 @@
-export([init/1, to_html/2, service_available/2, charsets_provided/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) ->
View
0 include/webmachine_controller.hrl → include/controller_webmachine_helper.hrl
File renamed without changes.
View
2 modules/mod_admin/controllers/controller_admin.erl
@@ -22,7 +22,7 @@
-export([is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, z_context:get(acl_module, Context, mod_admin), admin_logon, ReqData, Context).
View
2 modules/mod_admin/controllers/controller_admin_edit.erl
@@ -26,7 +26,7 @@
ensure_id/1
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
%% @todo Change this into "visible" and add a view instead of edit template.
is_authorized(ReqData, Context) ->
View
2 modules/mod_admin/controllers/controller_admin_media_preview.erl
@@ -26,7 +26,7 @@
to_image/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init([]) -> {ok, []}.
View
2 modules/mod_admin/controllers/controller_admin_referrers.erl
@@ -24,7 +24,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_admin, admin_logon, ReqData, Context).
View
2 modules/mod_admin_category/controllers/controller_admin_category_sorter.erl
@@ -23,7 +23,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_admin_category, ReqData, Context).
View
2 modules/mod_admin_config/controllers/controller_admin_config.erl
@@ -24,7 +24,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_admin_config, ReqData, Context).
View
2 modules/mod_admin_modules/controllers/controller_admin_module_manager.erl
@@ -23,7 +23,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_admin_modules, ReqData, Context).
View
2 modules/mod_atom/controllers/controller_atom_entry.erl
@@ -35,7 +35,7 @@
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
%% Let cached versions expire in an hour.
View
2 modules/mod_atom_feed/controllers/controller_atom_feed_cat.erl
@@ -34,7 +34,7 @@
provide_content/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
%% Let cached versions expire in an hour.
View
2 modules/mod_atom_feed/controllers/controller_atom_feed_search.erl
@@ -31,7 +31,7 @@
provide_content/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
%% Let cached versions expire in an hour.
View
2 modules/mod_authentication/controllers/controller_logoff.erl
@@ -24,7 +24,7 @@
-export([resource_exists/2, previously_existed/2, moved_temporarily/2]).
-export([reset_rememberme_cookie_and_logoff/1]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_authentication/controllers/controller_logon.erl
@@ -26,7 +26,7 @@
-export([event/2]).
-export([get_rememberme_cookie/1, reset_rememberme_cookie/1]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
-define(LOGON_REMEMBERME_COOKIE, "z_logon").
View
2 modules/mod_backup/controllers/controller_admin_backup.erl
@@ -24,7 +24,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_backup, ReqData, Context).
View
2 modules/mod_backup/controllers/controller_admin_backup_revision.erl
@@ -24,7 +24,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context0) ->
Context = ?WM_REQ(ReqData, Context0),
View
2 modules/mod_base/controllers/controller_api.erl
@@ -33,7 +33,7 @@
get_q_all/1
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_close_connection.erl
@@ -25,7 +25,7 @@
to_html/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(_Args) -> {ok, []}.
View
2 modules/mod_base/controllers/controller_comet.erl
@@ -28,7 +28,7 @@
process_post/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_base/controllers/controller_file_readonly.erl
@@ -40,7 +40,7 @@
finish_request/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
-record(cache, {path, fullpath, mime, last_modified, body}).
View
2 modules/mod_base/controllers/controller_id.erl
@@ -29,7 +29,7 @@
see_other/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_lib.erl
@@ -32,7 +32,7 @@
finish_request/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
%% These are used for file serving (move to metadata)
View
2 modules/mod_base/controllers/controller_page.erl
@@ -26,7 +26,7 @@
html/1
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
%% @doc Check if the id in the request (or dispatch conf) exists.
resource_exists(ReqData, Context) ->
View
2 modules/mod_base/controllers/controller_postback.erl
@@ -31,7 +31,7 @@
process_postback/1
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_redirect.erl
@@ -28,7 +28,7 @@
moved_permanently/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_base/controllers/controller_static_pages.erl
@@ -32,7 +32,7 @@
moved_temporarily/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
%% These are used for file serving (move to metadata)
View
2 modules/mod_base/controllers/controller_template.erl
@@ -28,7 +28,7 @@
provide_content/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_base/controllers/controller_user_agent_probe.erl
@@ -28,7 +28,7 @@
to_js/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_user_agent_select.erl
@@ -27,7 +27,7 @@
moved_temporarily/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_website_redirect.erl
@@ -26,7 +26,7 @@
moved_temporarily/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_base/controllers/controller_websocket.erl
@@ -31,7 +31,7 @@
handle_message/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(_Args) -> {ok, []}.
View
2 modules/mod_comment/controllers/controller_admin_comments.erl
@@ -25,7 +25,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_comment, ReqData, Context).
View
2 modules/mod_comment/controllers/controller_admin_comments_settings.erl
@@ -25,7 +25,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_comment, ReqData, Context).
View
2 modules/mod_development/controllers/controller_wmtrace.erl
@@ -28,7 +28,7 @@
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
-include_lib("webmachine_logger.hrl").
is_authorized(ReqData, Context) ->
View
2 modules/mod_development/controllers/controller_wmtrace_conf.erl
@@ -28,7 +28,7 @@
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
-include_lib("webmachine_logger.hrl").
%% GLOBAL
View
2 modules/mod_facebook/controllers/controller_admin_facebook.erl
@@ -25,7 +25,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_facebook, ReqData, Context).
View
2 modules/mod_facebook/controllers/controller_facebook_authorize.erl
@@ -24,7 +24,7 @@
-export([init/1, service_available/2, charsets_provided/2, content_types_provided/2]).
-export([resource_exists/2, previously_existed/2, moved_temporarily/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_facebook/controllers/controller_facebook_redirect.erl
@@ -25,7 +25,7 @@
-export([init/1, service_available/2, charsets_provided/2, content_types_provided/2]).
-export([resource_exists/2, previously_existed/2, moved_temporarily/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_mailinglist/controllers/controller_admin_mailing_preview.erl
@@ -24,7 +24,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
%% @todo Change this into "visible" and add a view instead of edit template.
is_authorized(ReqData, Context) ->
View
2 modules/mod_mailinglist/controllers/controller_admin_mailing_status.erl
@@ -24,7 +24,7 @@
is_authorized/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
%% @todo Change this into "visible" and add a view instead of edit template.
is_authorized(ReqData, Context) ->
View
2 modules/mod_mailinglist/controllers/controller_admin_mailinglist.erl
@@ -24,7 +24,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_mailinglist, ReqData, Context).
View
2 modules/mod_mailinglist/controllers/controller_admin_mailinglist_recipients.erl
@@ -24,7 +24,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_mailinglist, ReqData, Context).
View
2 modules/mod_mailinglist/controllers/controller_mailinglist_export.erl
@@ -31,7 +31,7 @@
to_text_csv/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_oauth/controllers/controller_oauth_access_token.erl
@@ -30,7 +30,7 @@
response/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
View
2 modules/mod_oauth/controllers/controller_oauth_apps.erl
@@ -25,7 +25,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
View
2 modules/mod_oauth/controllers/controller_oauth_authorize.erl
@@ -27,7 +27,7 @@
process_post/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
allowed_methods(ReqData, Context) ->
View
2 modules/mod_oauth/controllers/controller_oauth_request_token.erl
@@ -30,7 +30,7 @@
process_post/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
View
2 modules/mod_rest/controllers/controller_rest_rsc.erl
@@ -36,7 +36,7 @@
get_bert/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_seo/controllers/controller_admin_seo.erl
@@ -25,7 +25,7 @@
event/2
]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
is_authorized(ReqData, Context) ->
z_acl:wm_is_authorized(use, mod_seo, ReqData, Context).
View
2 modules/mod_signup/controllers/controller_signup.erl
@@ -24,7 +24,7 @@
-export([provide_content/2]).
-export([event/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_signup/controllers/controller_signup_confirm.erl
@@ -24,7 +24,7 @@
-export([provide_content/2]).
-export([event/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_survey/controllers/controller_survey_results.erl
@@ -32,7 +32,7 @@
provide_content/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
%% Let cached versions expire in an hour.
View
2 modules/mod_translation/controllers/controller_language_set.erl
@@ -28,7 +28,7 @@
moved_permanently/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
View
2 modules/mod_twitter/controllers/controller_twitter_authorize.erl
@@ -24,7 +24,7 @@
-export([init/1, service_available/2, charsets_provided/2, content_types_provided/2]).
-export([resource_exists/2, previously_existed/2, moved_temporarily/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 modules/mod_twitter/controllers/controller_twitter_redirect.erl
@@ -25,7 +25,7 @@
-export([init/1, service_available/2, charsets_provided/2, content_types_provided/2]).
-export([resource_exists/2, previously_existed/2, moved_temporarily/2]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").
init(DispatchArgs) -> {ok, DispatchArgs}.
View
2 priv/sites/testsandbox/controllers/controller_test_helloworld.erl
@@ -5,7 +5,7 @@
-module(controller_test_helloworld).
-export([event/2, periodic/2]).
--include_lib("html_controller.hrl").
+-include_lib("controller_html_helper.hrl").
html(Context) ->
{Incr, Context2} = z_context:incr_session(helloworld_counter, 1, Context),
View
2 priv/sites/zotonic_status/controllers/controller_zotonic_status.erl
@@ -26,7 +26,7 @@
updater/2
]).
--include_lib("webmachine_controller.hrl").
+-include_lib("controller_webmachine_helper.hrl").
-include_lib("include/zotonic.hrl").

0 comments on commit 32258d0

Please sign in to comment.
Something went wrong with that request. Please try again.