moved userhelper to avz_userhelper

src/avz.erl

@@ -14,7 +14,7 @@ event(logout) -> wf:user(undefined), wf:redirect(?LOGIN_PAGE);
 event(to_login) -> wf:redirect(?LOGIN_PAGE);
 event({register, #user{}=U}) -> kvs:add(U), login_user(U); % sample
 event({login, #user{}=U, N}) ->
-    Updated = userhelper:updateUser(U,N),
+    Updated = avz_userhelper:updateUser(U,N),
     kvs:put(Updated),
     login_user(Updated);                % sample
 event({Method,Event}) -> Method:event({Method,Event});

src/userhelper.erl → src/avz_userhelper.erl

@@ -1,4 +1,4 @@
--module(userhelper).
+-module(avz_userhelper).
 -export([updateProplist/2,updateUser/2]).
 
 -include_lib("kvs/include/user.hrl").

src/email.erl

@@ -12,7 +12,7 @@ registration_data(Props, email, Ori)->
             display_name = Email,
             email = Email,
             register_date = now(),
-            tokens = userhelper:updateProplist({email,Email},Ori#user.tokens),
+            tokens = avz_userhelper:updateProplist({email,Email},Ori#user.tokens),
             status = ok,
             password = kvs:sha(proplists:get_value(<<"password">>,Props))}.
 

src/facebook.erl

@@ -29,11 +29,11 @@ registration_data(Props, facebook, Ori)->
     Cover = case proplists:get_value(<<"cover">>,Props) of undefined -> ""; P -> case proplists:get_value(<<"source">>,P#struct.lst) of undefined -> ""; C -> binary_to_list(C) end end,
     Ori#user{   id = Email,
                 display_name = UserName,
-                images = userhelper:updateProplist({fb_cover,Cover},userhelper:updateProplist({fb_avatar,"https://graph.facebook.com/" ++ binary_to_list(Id) ++ "/picture?type=large"},Ori#user.images)),
+                images = avz_userhelper:updateProplist({fb_cover,Cover},avz_userhelper:updateProplist({fb_avatar,"https://graph.facebook.com/" ++ binary_to_list(Id) ++ "/picture?type=large"},Ori#user.images)),
                 email = Email,
                 names = proplists:get_value(<<"first_name">>, Props),
                 surnames = proplists:get_value(<<"last_name">>, Props),
-                tokens = userhelper:updateProplist({facebook,Id},Ori#user.tokens),
+                tokens = avz_userhelper:updateProplist({facebook,Id},Ori#user.tokens),
                 birth = {element(3, BirthDay), element(1, BirthDay), element(2, BirthDay)},
                 register_date = erlang:now(),
                 status = ok }.

src/github.erl

@@ -54,11 +54,11 @@ registration_data(Props, github, Ori) ->
     Ori#user{   id= Email,
                 username = binary_to_list(proplists:get_value(<<"login">>, Props)),
                 display_name = Name,
-                images = userhelper:updateProplist({gh_avatar,proplists:get_value(<<"avatar_url">>, Props)},Ori#user.images),
+                images = avz_userhelper:updateProplist({gh_avatar,proplists:get_value(<<"avatar_url">>, Props)},Ori#user.images),
                 email = Email,
                 names  = Name,
                 surnames = [],
-                tokens = userhelper:updateProplist({github,Id},Ori#user.tokens),
+                tokens = avz_userhelper:updateProplist({github,Id},Ori#user.tokens),
                 register_date = erlang:now(),
                 status = ok }.
 

src/google.erl

@@ -19,11 +19,11 @@ registration_data(Props, google, Ori)->
     Email = email_prop(Props,google),
     Ori#user{   id = Email,
                 display_name = proplists:get_value(<<"displayName">>, Props),
-                images = userhelper:updateProplist({google_avatar,Image},Ori#user.images),
+                images = avz_userhelper:updateProplist({google_avatar,Image},Ori#user.images),
                 email = Email,
                 names = GivenName,
                 surnames = FamilyName,
-                tokens = userhelper:updateProplist({google,Id},Ori#user.tokens),
+                tokens = avz_userhelper:updateProplist({google,Id},Ori#user.tokens),
                 register_date = erlang:now(),
                 sex = proplists:get_value(<<"gender">>, Props),
                 status = ok }.

src/microsoft.erl

@@ -31,7 +31,7 @@ registration_data(Props, microsoft, Ori)->
                 email = Email,
                 names = GivenName,
                 surnames = FamilyName,
-                tokens = userhelper:updateProplist({microsoft,Id},Ori#user.tokens),
+                tokens = avz_userhelper:updateProplist({microsoft,Id},Ori#user.tokens),
                 register_date = erlang:now(),
                 sex = proplists:get_value(<<"gender">>, Props),
                 status = ok }.

src/twitter.erl

@@ -16,11 +16,11 @@ registration_data(Props, twitter, Ori)->
     Ori#user{   id = Email,
                 username = re:replace(UserName, "\\.", "_", [{return, list}]),
                 display_name = proplists:get_value(<<"screen_name">>, Props),
-                images = userhelper:updateProplist({tw_avatar,proplists:get_value(<<"profile_image_url">>, Props)},Ori#user.images),
+                images = avz_userhelper:updateProplist({tw_avatar,proplists:get_value(<<"profile_image_url">>, Props)},Ori#user.images),
                 names = proplists:get_value(<<"name">>, Props),
                 email = Email,
                 surnames = [],
-                tokens = userhelper:updateProplist({twitter,Id},Ori#user.tokens),
+                tokens = avz_userhelper:updateProplist({twitter,Id},Ori#user.tokens),
                 register_date = erlang:now(),
                 status = ok }.