diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm index 93fc0b6bd..8abc64fd1 100644 --- a/lib/WebGUI/Account/FriendManager.pm +++ b/lib/WebGUI/Account/FriendManager.pm @@ -227,7 +227,7 @@ sub www_editFriends { ##We don't use acceptsFriendsRequests here because it's overkill. ##No need to check invitations, since friends are managed. ##Existing friends are already filtered out. - next USERID unless $user->profileField('ableToBeFriend') || $overrideProfile; + next USERID unless $user->get('ableToBeFriend') || $overrideProfile; push @usersToAdd, [ $newFriendId, $user->username ]; } diff --git a/lib/WebGUI/Account/Friends.pm b/lib/WebGUI/Account/Friends.pm index c34741b05..2849365bf 100644 --- a/lib/WebGUI/Account/Friends.pm +++ b/lib/WebGUI/Account/Friends.pm @@ -66,11 +66,11 @@ sub canView { my $session = $self->session; my $uid = $self->uid; - return 1 if (($session->user->userId eq $uid || $uid eq "") && $session->user->profileField('ableToBeFriend')); + return 1 if (($session->user->userId eq $uid || $uid eq "") && $session->user->get('ableToBeFriend')); my $user = WebGUI::User->new($session,$uid); return 0 if($user->isVisitor); #This should never happen but let's make sure - return 0 unless ($user->profileField('ableToBeFriend')); #User doesn't have friends enabled + return 0 unless ($user->get('ableToBeFriend')); #User doesn't have friends enabled return WebGUI::User->new($session,$uid)->profileIsViewable($session->user); #User's profile isn't viewable by this user } @@ -491,7 +491,7 @@ sub www_view { my $displayView = $uid ne ""; $var->{'display_message'} = $msg; - unless ($user->profileField('ableToBeFriend') && $user->profileIsViewable($session->user)) { + unless ($user->get('ableToBeFriend') && $user->profileIsViewable($session->user)) { my $i18n = WebGUI::International->new($session,"Account_Friends"); my $errorMsg = ""; if($var->{'can_edit'}) { diff --git a/lib/WebGUI/Account/Inbox.pm b/lib/WebGUI/Account/Inbox.pm index c7900067f..5e09d3e54 100644 --- a/lib/WebGUI/Account/Inbox.pm +++ b/lib/WebGUI/Account/Inbox.pm @@ -59,7 +59,7 @@ sub appendCommonVars { $var->{'view_invitations_url' } = $self->getUrl("module=inbox;do=manageInvitations"); $var->{'unread_message_count' } = $inbox->getUnreadMessageCount($user->userId); $var->{'invitation_count' } = $self->getInvitationCount; - $var->{'invitations_enabled' } = $user->profileField('ableToBeFriend'); + $var->{'invitations_enabled' } = $user->get('ableToBeFriend'); $var->{'user_invitations_enabled'} = $session->setting->get("inboxInviteUserEnabled"); $var->{'invite_friend_url' } = $self->getUrl("module=inbox;do=inviteUser"); @@ -894,7 +894,7 @@ sub www_inviteUserSave { return $self->www_inviteUser($i18n->get('missing message')) unless $message; #Profile Email address check - my $email = $session->user->profileField('email'); + my $email = $session->user->get('email'); unless ($email) { return $self->www_inviteUser($i18n->get('no email')); } diff --git a/lib/WebGUI/Account/Profile.pm b/lib/WebGUI/Account/Profile.pm index f0071ec21..72f624aa4 100644 --- a/lib/WebGUI/Account/Profile.pm +++ b/lib/WebGUI/Account/Profile.pm @@ -113,7 +113,7 @@ sub appendCommonVars { $self->SUPER::appendCommonVars($var); $var->{'edit_profile_url' } = $self->getUrl("module=profile;do=edit"); - $var->{'invitations_enabled' } = $user->profileField('ableToBeFriend'); + $var->{'invitations_enabled' } = $user->get('ableToBeFriend'); $var->{'profile_category_loop'} = []; #Append the categories @@ -244,7 +244,7 @@ sub getExtrasStyle { return $errorStyle if $field->getId ~~ $fieldErrors; return "" unless ($field->isRequired); - return $requiredStyle unless($self->session->user->profileField($field->getId) || $fieldValue); + return $requiredStyle unless($self->session->user->get($field->getId) || $fieldValue); return $requiredStyleOff; } @@ -359,7 +359,7 @@ sub www_edit { foreach my $field (@{ $category->getFields( { editable => 1 } ) }) { my $fieldId = $field->getId; my $fieldLabel = $field->getLabel; - my $fieldForm = $field->formField({ extras=>$self->getExtrasStyle($field,\@errorFields,$user->profileField($fieldId)) }); + my $fieldForm = $field->formField({ extras=>$self->getExtrasStyle($field,\@errorFields,$user->get($fieldId)) }); my $fieldRequired = $field->isRequired; my $fieldExtras = $field->getExtras; my $fieldViewable = $field->isViewable; @@ -472,7 +472,7 @@ sub www_view { $self->appendCommonVars($var); - my $privacySetting = $user->profileField('publicProfile') || 'none'; + my $privacySetting = $user->get('publicProfile') || 'none'; $var->{"profile_privacy_$privacySetting"} = "true"; $var->{'acceptsPrivateMessages'} @@ -501,7 +501,7 @@ sub www_view { my $fieldId = $field->getId; my $fieldLabel = $field->getLabel; my $fieldValue = $field->formField(undef,2,$user); - my $fieldRaw = $user->profileField($fieldId);; + my $fieldRaw = $user->get($fieldId);; #Create a seperate template var for each field my $fieldBase = 'profile_field_'.$fieldId; $var->{$fieldBase.'_label' } = $fieldLabel; diff --git a/lib/WebGUI/Admin.pm b/lib/WebGUI/Admin.pm index 442ea532d..ef751c75e 100644 --- a/lib/WebGUI/Admin.pm +++ b/lib/WebGUI/Admin.pm @@ -99,7 +99,7 @@ sub getAdminPluginTemplateVars { elsif ( defined $funcDef->{groupSetting} ) { $canUse = $user->isInGroup( $setting->get( $funcDef->{groupSetting} ) ); } - if ( $funcDef->{uiLevel} > $user->profileField("uiLevel") ) { + if ( $funcDef->{uiLevel} > $user->get("uiLevel") ) { $canUse = 0; } next unless $canUse; @@ -227,7 +227,7 @@ sub getNewContentTemplateVars { # Build the categories my %rawCategories = %{ $config->get('assetCategories') }; my %categories; # All the categories we have - my $userUiLevel = $user->profileField('uiLevel'); + my $userUiLevel = $user->get('uiLevel'); foreach my $category ( keys %rawCategories ) { # Check the ui level next if $rawCategories{$category}{uiLevel} > $userUiLevel; diff --git a/lib/WebGUI/AdminConsole.pm b/lib/WebGUI/AdminConsole.pm index 7cc74ff0b..44931e601 100644 --- a/lib/WebGUI/AdminConsole.pm +++ b/lib/WebGUI/AdminConsole.pm @@ -169,7 +169,7 @@ sub getAdminFunction { elsif (defined $functions->{$function}{groupSetting}) { $canUse = $user->isInGroup($setting->get($functions->{$function}{groupSetting})); } - if ($functions->{$function}{uiLevel} > $user->profileField("uiLevel")) { + if ($functions->{$function}{uiLevel} > $user->get("uiLevel")) { $canUse = 0; } diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 7f084893d..74ac26e05 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -1484,7 +1484,7 @@ sub getPrototypeList { } my $db = $session->db; my @prototypeIds = $db->buildArray("select distinct assetId from assetData where isPrototype=1"); - my $userUiLevel = $session->user->profileField('uiLevel'); + my $userUiLevel = $session->user->get('uiLevel'); my @assets; ID: foreach my $id (@prototypeIds) { my $asset = WebGUI::Asset->newById($session, $id); @@ -1598,7 +1598,7 @@ sub getToolbar { return undef unless $self->canEdit && $self->session->isAdminOn; return $self->{_toolbar} if (exists $self->{_toolbar}); - my $userUiLevel = $self->session->user->profileField("uiLevel"); + my $userUiLevel = $self->session->user->get("uiLevel"); my $uiLevels = $self->session->config->get("assetToolbarUiLevel"); my $i18n = WebGUI::International->new($self->session, "Asset"); my $toolbar = ""; diff --git a/lib/WebGUI/Asset/MatrixListing.pm b/lib/WebGUI/Asset/MatrixListing.pm index 28fde9fbf..5019a085f 100644 --- a/lib/WebGUI/Asset/MatrixListing.pm +++ b/lib/WebGUI/Asset/MatrixListing.pm @@ -741,7 +741,7 @@ sub view { $mailForm->email( -extras =>'class="content"', -name =>"from", - -value =>$session->user->profileField("email"), + -value =>$session->user->get("email"), -label =>$i18n->get('your email label'), ); $mailForm->selectBox( @@ -1020,7 +1020,7 @@ sub www_sendEmail { if ($form->process("body") ne "") { my $user = WebGUI::User->new($self->session, $self->get('maintainerId')); my $mail = WebGUI::Mail::Send->create($self->session,{ - to =>$user->profileField("email"), + to =>$user->get("email"), subject =>$self->get('productName')." - ".$form->process("subject"), from=>$form->process("from") }); diff --git a/lib/WebGUI/Asset/Post.pm b/lib/WebGUI/Asset/Post.pm index ccc893b77..d89b905c1 100644 --- a/lib/WebGUI/Asset/Post.pm +++ b/lib/WebGUI/Asset/Post.pm @@ -42,7 +42,7 @@ property username => ( sub _username_builder { my $session = shift->session; return $session->form->process("visitorUsername") - || $session->user->profileField("alias") + || $session->user->get("alias") || $session->user->username; } property rating => ( @@ -476,7 +476,7 @@ sub getAvatarUrl { return '' unless $parent and $parent->avatarsEnabled; my $user = WebGUI::User->new($self->session, $self->ownerUserId); #Get avatar field, storage Id. - my $storageId = $user->profileField("avatar"); + my $storageId = $user->get("avatar"); return '' unless $storageId; my $avatar = WebGUI::Storage->get($self->session,$storageId); my $avatarUrl = ''; @@ -963,7 +963,7 @@ sub notifySubscribers { my $companyAddress = $setting->get("companyEmail"); my $listAddress = $cs->mailAddress; my $posterAddress = $user->getProfileFieldPrivacySetting('email') eq "all" - ? $user->profileField('email') + ? $user->get('email') : ''; my $from = $posterAddress || $listAddress || $companyAddress; my $replyTo = $listAddress || $returnAddress || $companyAddress; @@ -1079,7 +1079,7 @@ override processEditForm => sub { if ($form->process("assetId") eq "new") { my %data = ( ownerUserId => $session->user->userId, - username => $form->process("visitorName") || $session->user->profileField("alias") || $session->user->username, + username => $form->process("visitorName") || $session->user->get("alias") || $session->user->username, ); $self->update(\%data); } @@ -1132,7 +1132,7 @@ sub postProcess { } my $i18n = WebGUI::International->new($self->session, "Asset_Post"); if ($self->getThread->getParent->get("addEditStampToPosts")) { - $data{content} .= "

\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->profileField("alias").") --- \n

"; + $data{content} .= "

\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->get("alias").") --- \n

"; } $data{url} = $self->fixUrl($self->getThread->url."/1") if ($self->isReply && $self->isNew); $data{groupIdView} = $self->getThread->getParent->groupIdView; @@ -1556,7 +1556,7 @@ sub www_edit { value => defined $subscribe ? $subscribe : 1, }); } - $content .= "\n\n".$user->profileField("signature") if ($user->profileField("signature") && !$form->process("content")); + $content .= "\n\n".$user->get("signature") if ($user->get("signature") && !$form->process("content")); } else { # edit return $privilege->insufficient() unless ($self->canEdit); diff --git a/lib/WebGUI/Asset/Post/Thread.pm b/lib/WebGUI/Asset/Post/Thread.pm index 08cabf755..57d329378 100644 --- a/lib/WebGUI/Asset/Post/Thread.pm +++ b/lib/WebGUI/Asset/Post/Thread.pm @@ -1086,7 +1086,7 @@ sub view { return $out if $out; } $self->session->scratch->set("discussionLayout",$self->session->form->process("layout")) if ($self->session->form->process("layout")); - my $layout = $self->session->scratch->get("discussionLayout") || $self->session->user->profileField("discussionLayout"); + my $layout = $self->session->scratch->get("discussionLayout") || $self->session->user->get("discussionLayout"); my $var = $self->getTemplateVars; $self->getParent->appendTemplateLabels($var); diff --git a/lib/WebGUI/Asset/Template/Parser.pm b/lib/WebGUI/Asset/Template/Parser.pm index 2771736d6..711bbba69 100644 --- a/lib/WebGUI/Asset/Template/Parser.pm +++ b/lib/WebGUI/Asset/Template/Parser.pm @@ -37,7 +37,7 @@ sub addSessionVars { # These are the only session template variables used in the core as # of 6.8.5. Further use of session template vars is deprecated. $vars->{"session.user.username"} = $self->session->user->username; - $vars->{"session.user.firstDayOfWeek"} = $self->session->user->profileField("firstDayOfWeek"); + $vars->{"session.user.firstDayOfWeek"} = $self->session->user->get("firstDayOfWeek"); $vars->{"session.config.extrasurl"} = $self->session->url->extras(); $vars->{"session.var.adminOn"} = $self->session->isAdminOn; $vars->{"session.setting.companyName"} = $self->session->setting->get("companyName"); diff --git a/lib/WebGUI/Asset/WikiPage.pm b/lib/WebGUI/Asset/WikiPage.pm index d75ed6178..bc94972c9 100644 --- a/lib/WebGUI/Asset/WikiPage.pm +++ b/lib/WebGUI/Asset/WikiPage.pm @@ -519,7 +519,7 @@ sub www_getHistory { .$icon->edit('func=edit;revision='.$revision->revisionDate, $revision->url) .$icon->view('func=view;revision='.$revision->revisionDate, $revision->url), date => $date->epochToHuman($revision->revisionDate), - username => $user->profileField('alias') || $user->username, + username => $user->get('alias') || $user->username, actionTaken => $revision->actionTaken, interval => join(" ", $date->secondsToInterval(time() - $revision->revisionDate)) }); diff --git a/lib/WebGUI/Asset/Wobject/Calendar.pm b/lib/WebGUI/Asset/Wobject/Calendar.pm index c5aa3c1f4..f28601496 100644 --- a/lib/WebGUI/Asset/Wobject/Calendar.pm +++ b/lib/WebGUI/Asset/Wobject/Calendar.pm @@ -1200,7 +1200,7 @@ sub viewMonth { #### Create the template parameters ## The grid - my $first_dow = $session->user->profileField("firstDayOfWeek") || 0; + my $first_dow = $session->user->get("firstDayOfWeek") || 0; # 0 - sunday # 1 - mon # 2 - tue @@ -1333,7 +1333,7 @@ sub viewWeek { $dt->truncate( to => "day"); # Apply First Day of Week settings - my $first_dow = $session->user->profileField("firstDayOfWeek") || 0; + my $first_dow = $session->user->get("firstDayOfWeek") || 0; # 0 - sunday # 1 - monday # 2 - tuesday, etc... diff --git a/lib/WebGUI/Asset/Wobject/Navigation.pm b/lib/WebGUI/Asset/Wobject/Navigation.pm index c16f63604..e3fdf6d24 100644 --- a/lib/WebGUI/Asset/Wobject/Navigation.pm +++ b/lib/WebGUI/Asset/Wobject/Navigation.pm @@ -311,7 +311,7 @@ override getToolbar => sub { if ($self->getToolbarState) { my $toolbar = ''; if ($self->canEditIfLocked) { - my $userUiLevel = $self->session->user->profileField("uiLevel"); + my $userUiLevel = $self->session->user->get("uiLevel"); my $uiLevels = $self->session->config->get("assetToolbarUiLevel"); my $returnUrl = ''; if ($self->session->asset) { diff --git a/lib/WebGUI/Asset/Wobject/ProjectManager.pm b/lib/WebGUI/Asset/Wobject/ProjectManager.pm index 8570b9cba..0773b43e3 100644 --- a/lib/WebGUI/Asset/Wobject/ProjectManager.pm +++ b/lib/WebGUI/Asset/Wobject/ProjectManager.pm @@ -263,7 +263,7 @@ sub _htmlOfResourceList { $subvar->{resourceIcon} = 'groups.gif'; } elsif ($resourceKind eq 'user') { my $user = WebGUI::User->new($self->session, $resourceId); - my ($firstName, $lastName, $username) = ($user->profileField('firstName'), $user->profileField('lastName'), $user->username); + my ($firstName, $lastName, $username) = ($user->get('firstName'), $user->get('lastName'), $user->username); my $displayName = do { if (length($firstName) && length($lastName)) { "$lastName, $firstName" } elsif (length($firstName)) { $firstName } diff --git a/lib/WebGUI/Asset/Wobject/StoryArchive.pm b/lib/WebGUI/Asset/Wobject/StoryArchive.pm index 8e88d1a90..dfa423811 100644 --- a/lib/WebGUI/Asset/Wobject/StoryArchive.pm +++ b/lib/WebGUI/Asset/Wobject/StoryArchive.pm @@ -572,7 +572,7 @@ sub viewTemplateVariables { my $datePointer = undef; my $icon = $session->icon; - my $userUiLevel = $session->user->profileField("uiLevel"); + my $userUiLevel = $session->user->get("uiLevel"); my $uiLevels = $session->config->get('assetToolbarUiLevel'); ##Only build objects for the assets that we need diff --git a/lib/WebGUI/Asset/Wobject/StoryTopic.pm b/lib/WebGUI/Asset/Wobject/StoryTopic.pm index 62aaf508c..a19e83a24 100644 --- a/lib/WebGUI/Asset/Wobject/StoryTopic.pm +++ b/lib/WebGUI/Asset/Wobject/StoryTopic.pm @@ -174,7 +174,7 @@ sub viewTemplateVariables { $var->{story_loop} = []; my $icon = $session->icon; - my $userUiLevel = $session->user->profileField("uiLevel"); + my $userUiLevel = $session->user->get("uiLevel"); my $uiLevels = $session->config->get('assetToolbarUiLevel'); my $i18n = WebGUI::International->new($session); diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index f13fce605..9ac071e6c 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -1192,7 +1192,7 @@ sub www_login { # Set the proper redirect if ( $self->session->setting->get( 'showMessageOnLogin' ) - && $self->user->profileField( $LOGIN_MESSAGE_SEEN ) + && $self->user->get( $LOGIN_MESSAGE_SEEN ) < $self->session->setting->get( 'showMessageOnLoginTimes' ) ) { return $self->showMessageOnLogin; @@ -1264,8 +1264,8 @@ sub www_showMessageOnLogin { my $i18n = WebGUI::International->new( $self->session, 'Auth' ); # Increment the number of time seen. - $self->user->profileField( $LOGIN_MESSAGE_SEEN, - $self->user->profileField( $LOGIN_MESSAGE_SEEN ) + 1 + $self->user->get( $LOGIN_MESSAGE_SEEN, + $self->user->get( $LOGIN_MESSAGE_SEEN ) + 1 ); # Show the message, processing for macros diff --git a/lib/WebGUI/Auth/Facebook.pm b/lib/WebGUI/Auth/Facebook.pm index 2067053a2..d1307cf49 100644 --- a/lib/WebGUI/Auth/Facebook.pm +++ b/lib/WebGUI/Auth/Facebook.pm @@ -46,9 +46,9 @@ sub createFacebookUser { my ( $self, $fbuser ) = @_; my $user = WebGUI::User->create( $self->session ); $user->username( $fbuser->{name} ); - $user->profileField('email', $fbuser->{email}); - $user->profileField('firstName', $fbuser->{first_name}); - $user->profileField('lastName', $fbuser->{last_name}); + $user->get('email', $fbuser->{email}); + $user->get('firstName', $fbuser->{first_name}); + $user->get('lastName', $fbuser->{last_name}); $self->update( "facebookUserId" => $fbuser->{id}, ); diff --git a/lib/WebGUI/Auth/LDAP.pm b/lib/WebGUI/Auth/LDAP.pm index 971ff768f..9d9fc1cef 100644 --- a/lib/WebGUI/Auth/LDAP.pm +++ b/lib/WebGUI/Auth/LDAP.pm @@ -687,7 +687,7 @@ sub www_displayAccount { $vars->{displayTitle} = '

'.$i18n->get(61).'

'; $vars->{'account.message'} = $i18n->get(856); if($self->session->setting->get("useKarma")){ - $vars->{'account.form.karma'} = $self->session->user->profileField("karma"); + $vars->{'account.form.karma'} = $self->session->user->get("karma"); $vars->{'account.form.karma.label'} = $i18n->get(537); } diff --git a/lib/WebGUI/Auth/WebGUI.pm b/lib/WebGUI/Auth/WebGUI.pm index 1177b48de..490044553 100644 --- a/lib/WebGUI/Auth/WebGUI.pm +++ b/lib/WebGUI/Auth/WebGUI.pm @@ -1113,7 +1113,7 @@ sub www_emailRecoverPasswordFinish { # generate information necessry to proceed my $recoveryGuid = $session->id->generate(); my $userId = $user->userId; #get the user guid - $email = $user->profileField('email'); + $email = $user->get('email'); if ( ! $email ) { return $self->www_recoverPassword( $i18n->get( 'no email address', 'AuthWebGUI' ) ); diff --git a/lib/WebGUI/Content/AssetManager.pm b/lib/WebGUI/Content/AssetManager.pm index e56ad3c59..e47091742 100644 --- a/lib/WebGUI/Content/AssetManager.pm +++ b/lib/WebGUI/Content/AssetManager.pm @@ -164,7 +164,7 @@ Gets the "More" menu with the specified label. sub getMoreMenu { my $session = shift; my $label = shift || "More"; - my $userUiLevel = $session->user->profileField("uiLevel"); + my $userUiLevel = $session->user->get("uiLevel"); my $toolbarUiLevel = $session->config->get("assetToolbarUiLevel"); my $i18n = WebGUI::International->new( $session, "Asset" ); diff --git a/lib/WebGUI/Form/Control.pm b/lib/WebGUI/Form/Control.pm index 5ca96873d..ee4a3052e 100644 --- a/lib/WebGUI/Form/Control.pm +++ b/lib/WebGUI/Form/Control.pm @@ -572,7 +572,7 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov sub passUiLevelCheck { my $self = shift; my $user = $self->session->user; - return $self->get("uiLevel") <= $user->profileField("uiLevel") || $user->isAdmin; + return $self->get("uiLevel") <= $user->get("uiLevel") || $user->isAdmin; } diff --git a/lib/WebGUI/Form/Date.pm b/lib/WebGUI/Form/Date.pm index 346160032..a80aab5c7 100644 --- a/lib/WebGUI/Form/Date.pm +++ b/lib/WebGUI/Form/Date.pm @@ -154,7 +154,7 @@ sub getValue { # NOTE: Cannot fix time zone since we don't have a complete date/time if($value =~ $isaEpoch){ - return $self->session->datetime->epochToSet($value,$self->session->user->profileField( 'timeZone' )); + return $self->session->datetime->epochToSet($value,$self->session->user->get( 'timeZone' )); } # Verify format diff --git a/lib/WebGUI/Form/DateTime.pm b/lib/WebGUI/Form/DateTime.pm index 1cec2172e..c3cb15c6f 100644 --- a/lib/WebGUI/Form/DateTime.pm +++ b/lib/WebGUI/Form/DateTime.pm @@ -93,7 +93,7 @@ sub definition { defaultValue=> 19 }, timeZone=>{ - defaultValue=> $session->user->profileField("timeZone") + defaultValue=> $session->user->get("timeZone") }, }); return $class->SUPER::definition($session, $definition); @@ -153,7 +153,7 @@ sub getValue { # YY(YY)?-MM-DD HH:MM:SS if($value =~ $isaEpoch){ - return $self->session->datetime->epochToSet($value,$self->session->user->profileField( 'timeZone' )); + return $self->session->datetime->epochToSet($value,$self->session->user->get( 'timeZone' )); } # Verify format @@ -162,7 +162,7 @@ sub getValue { # Fix time zone - $value = WebGUI::DateTime->new($self->session,mysql => $value, time_zone=>$self->session->user->profileField( 'timeZone' )) + $value = WebGUI::DateTime->new($self->session,mysql => $value, time_zone=>$self->session->user->get( 'timeZone' )) ->set_time_zone("UTC")->toMysql; return $value; diff --git a/lib/WebGUI/HTMLForm.pm b/lib/WebGUI/HTMLForm.pm index 7d5d8c004..2d250dd8e 100644 --- a/lib/WebGUI/HTMLForm.pm +++ b/lib/WebGUI/HTMLForm.pm @@ -61,7 +61,7 @@ These methods are available from this class: #------------------------------------------------------------------- sub _uiLevelChecksOut { my $self = shift; - if ($_[0] <= $self->session->user->profileField("uiLevel")) { + if ($_[0] <= $self->session->user->get("uiLevel")) { return 1; } else { diff --git a/lib/WebGUI/Macro/AdminBar.pm b/lib/WebGUI/Macro/AdminBar.pm index 83c4ee9c0..00b6e535c 100644 --- a/lib/WebGUI/Macro/AdminBar.pm +++ b/lib/WebGUI/Macro/AdminBar.pm @@ -111,7 +111,7 @@ sub process { my %rawCategories = %{$config->get('assetCategories')}; my %categories; my %categoryTitles; - my $userUiLevel = $user->profileField('uiLevel'); + my $userUiLevel = $user->get('uiLevel'); foreach my $category (keys %rawCategories) { next if $rawCategories{$category}{uiLevel} > $userUiLevel; next if (exists $rawCategories{$category}{group} && !$user->isInGroup($rawCategories{$category}{group})); diff --git a/lib/WebGUI/Macro/ConvertUTCToTZ.pm b/lib/WebGUI/Macro/ConvertUTCToTZ.pm index afaa30ec7..70283a331 100644 --- a/lib/WebGUI/Macro/ConvertUTCToTZ.pm +++ b/lib/WebGUI/Macro/ConvertUTCToTZ.pm @@ -60,8 +60,8 @@ time - time component formatted as HH:MM:SS sub process { my ( $session, $toTZ, $format, $date, $time ) = @_; - my $uTZ = $session->user->profileField("timeZone"); - my $uFormat = $session->user->profileField("dateFormat"); + my $uTZ = $session->user->get("timeZone"); + my $uFormat = $session->user->get("dateFormat"); $toTZ ||= $uTZ; $format ||= $uFormat; diff --git a/lib/WebGUI/Macro/PickLanguage.pm b/lib/WebGUI/Macro/PickLanguage.pm index 1e91a8607..2e47a06dc 100644 --- a/lib/WebGUI/Macro/PickLanguage.pm +++ b/lib/WebGUI/Macro/PickLanguage.pm @@ -52,7 +52,7 @@ sub process { my $languages = $i18n->getLanguages(); my $currentLanguage = $session->scratch->get('language') ? $session->scratch->get('language') - : $session->user->profileField('language'); + : $session->user->get('language'); my @lang_loop = (); foreach my $language ( keys %$languages ) { my $isCurrentLanguage = $currentLanguage eq $language ? 1 : 0; diff --git a/lib/WebGUI/Macro/User.pm b/lib/WebGUI/Macro/User.pm index f91d8c5c6..a0c8dd038 100644 --- a/lib/WebGUI/Macro/User.pm +++ b/lib/WebGUI/Macro/User.pm @@ -50,7 +50,7 @@ sub process { : $session->user ; - return $user->profileField($field); + return $user->get($field); } 1; diff --git a/lib/WebGUI/Macro/UsersOnline.pm b/lib/WebGUI/Macro/UsersOnline.pm index 3c8cb1a46..38533fa3e 100644 --- a/lib/WebGUI/Macro/UsersOnline.pm +++ b/lib/WebGUI/Macro/UsersOnline.pm @@ -85,7 +85,7 @@ sub process { # Obtain internationalization instance my $i18n = WebGUI::International->new($session, "Macro_UsersOnline"); # Get preferred time format of current user - my $time_format = $session->user->profileField("timeFormat"); + my $time_format = $session->user->get("timeFormat"); # Calculate epoch time for comparison to last activity my $dt = $session->datetime; @@ -165,7 +165,7 @@ sub _visitors { my $db = $session->db(); my $dt = $session->datetime; # Get preferred time format of current user - my $time_format = $session->user->profileField("timeFormat"); + my $time_format = $session->user->get("timeFormat"); # SQL conditional clause for filtering server IP my $ip_clause; @@ -249,7 +249,7 @@ sub _members { my $db = $session->db(); my $dt = $session->datetime; # Get preferred time format of current user - my $time_format = $session->user->profileField("timeFormat"); + my $time_format = $session->user->get("timeFormat"); # Determine the number of registered users that are online. The Admin # account is excluded from the list. @@ -269,10 +269,10 @@ sub _members { my $user = WebGUI::User->new($session, $row{'userId'}); # Only show users with the "showOnline" flag set to true - if ($user->profileField("showOnline")) { + if ($user->get("showOnline")) { # Find URL of avatar if available my $avatar_url; - my $avatar = $user->profileField("avatar"); + my $avatar = $user->get("avatar"); if ($avatar) { my $storage = WebGUI::Storage->get($session, $avatar); my @files = @{ $storage->getFiles() }; @@ -284,10 +284,10 @@ sub _members { # Add item to member template loop push(@{$var->{'member_loop'}}, { username => $user->username(), - firstName => $user->profileField("firstName"), - middleName => $user->profileField("middleName"), - lastName => $user->profileField("lastName"), - alias => $user->profileField("alias"), + firstName => $user->get("firstName"), + middleName => $user->get("middleName"), + lastName => $user->get("lastName"), + alias => $user->get("alias"), avatar => $avatar_url, uid => $row{'userId'}, sessionId => $row{'sessionId'}, diff --git a/lib/WebGUI/Mail/Send.pm b/lib/WebGUI/Mail/Send.pm index 260ad31be..9e5d2620d 100644 --- a/lib/WebGUI/Mail/Send.pm +++ b/lib/WebGUI/Mail/Send.pm @@ -332,7 +332,7 @@ sub create { $email = $user->getInboxNotificationAddresses; } else { - $email = $user->profileField("email"); + $email = $user->get("email"); } if ($email) { if ($headers->{to}) { @@ -568,7 +568,7 @@ sub send { $emailAddress = $user->getInboxNotificationAddresses; } else { - $emailAddress = $user->profileField('email'); + $emailAddress = $user->get('email'); } next USER unless $emailAddress; $mail->head->replace('To', $emailAddress); diff --git a/lib/WebGUI/Operation/Help.pm b/lib/WebGUI/Operation/Help.pm index 1616fa45a..b127d2fdc 100644 --- a/lib/WebGUI/Operation/Help.pm +++ b/lib/WebGUI/Operation/Help.pm @@ -291,7 +291,7 @@ sub www_viewHelp { else { $vars{body} = $i18n->get($help->{body}) if $help->{body}; ##Body entry is optional } - my $userUiLevel = $session->user->profileField("uiLevel"); + my $userUiLevel = $session->user->get("uiLevel"); my $uiOverride = $session->form->process("uiOverride"); foreach my $row (@{ $help->{fields} }) { push @{ $vars{fields} }, diff --git a/lib/WebGUI/Role/Asset/Comments.pm b/lib/WebGUI/Role/Asset/Comments.pm index f805d69bb..989d6e2d6 100644 --- a/lib/WebGUI/Role/Asset/Comments.pm +++ b/lib/WebGUI/Role/Asset/Comments.pm @@ -84,7 +84,7 @@ sub addComment { my $comments = $self->get('comments'); push @$comments, { id => $session->id->generate, - alias => $user->profileField('alias'), + alias => $user->get('alias'), userId => $user->userId, comment => $comment, rating => $rating, diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm index b2997ddc5..7fa16a207 100644 --- a/lib/WebGUI/Session/DateTime.pm +++ b/lib/WebGUI/Session/DateTime.pm @@ -292,7 +292,7 @@ sub epochToHuman { $epoch = time(); } my $i18n = WebGUI::International->new($self->session); - my $language = $i18n->getLanguage($self->session->user->profileField('language')); + my $language = $i18n->getLanguage($self->session->user->get('language')); my $locale = $language->{languageAbbreviation} || 'en'; $locale .= "_".$language->{locale} if ($language->{locale}); my $time_zone = $self->getTimeZone(); @@ -300,10 +300,10 @@ sub epochToHuman { my $output = shift || "%z %Z"; my $temp; #---date format preference - $temp = $self->session->user->profileField('dateFormat') || '%M/%D/%y'; + $temp = $self->session->user->get('dateFormat') || '%M/%D/%y'; $output =~ s/\%z/$temp/g; #---time format preference - $temp = $self->session->user->profileField('timeFormat') || '%H:%n %p'; + $temp = $self->session->user->get('timeFormat') || '%H:%n %p'; $output =~ s/\%Z/$temp/g; #--- convert WebGUI date formats to DateTime formats my %conversion = ( @@ -609,7 +609,7 @@ sub getTimeZone { return 'America/Chicago' unless defined $self->session->db(1); return $self->session->user->{_timeZone} if $self->session->user->{_timeZone}; my @zones = @{DateTime::TimeZone::all_names()}; - my $zone = $self->session->user->profileField('timeZone'); + my $zone = $self->session->user->get('timeZone'); $zone =~ s/ /\_/g; if ($zone) { if ( $zone ~~ @zones ) { diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm index 96c996027..52d0beb82 100644 --- a/lib/WebGUI/Session/Icon.pm +++ b/lib/WebGUI/Session/Icon.pm @@ -64,11 +64,11 @@ Returns the base URL for this user's toolbar icon set. sub getBaseURL { my $self = shift; my $url = $self->session->url->extras('toolbar/'); - my $toolbar = $self->session->user->profileField("toolbar"); + my $toolbar = $self->session->user->get("toolbar"); if ($toolbar ne "useLanguageDefault") { $url .= $toolbar; } else { - $url .= WebGUI::International->new($self->session,'Icon')->getLanguage($self->session->user->profileField("language"),"toolbar"); + $url .= WebGUI::International->new($self->session,'Icon')->getLanguage($self->session->user->get("language"),"toolbar"); } $url .= '/'; return $url; diff --git a/lib/WebGUI/Shop/AddressBook.pm b/lib/WebGUI/Shop/AddressBook.pm index 4d256542c..802bb8082 100644 --- a/lib/WebGUI/Shop/AddressBook.pm +++ b/lib/WebGUI/Shop/AddressBook.pm @@ -614,17 +614,17 @@ sub www_editAddress { if ( $copyFrom eq 'work' || $copyFrom eq 'home' ) { my $user = $session->user; - $properties->{ address1 } = $user->profileField( $copyFrom . 'Address' ); - $properties->{ firstName } = $user->profileField( 'firstName' ); + $properties->{ address1 } = $user->get( $copyFrom . 'Address' ); + $properties->{ firstName } = $user->get( 'firstName' ); $properties->{ lastName } = - join ' ', $user->profileField( 'middleName' ), $user->profileField( 'lastName' ); - $properties->{ city } = $user->profileField( $copyFrom . 'City' ); - $properties->{ state } = $user->profileField( $copyFrom . 'State' ); - $properties->{ country } = $user->profileField( $copyFrom . 'Country' ); - $properties->{ code } = $user->profileField( $copyFrom . 'Zip' ); - $properties->{ phoneNumber } = $user->profileField( $copyFrom . 'Phone' ); - $properties->{ email } = $user->profileField( 'email' ); - $properties->{ organization } = $user->profileField( 'workName' ) if $copyFrom eq 'work'; + join ' ', $user->get( 'middleName' ), $user->get( 'lastName' ); + $properties->{ city } = $user->get( $copyFrom . 'City' ); + $properties->{ state } = $user->get( $copyFrom . 'State' ); + $properties->{ country } = $user->get( $copyFrom . 'Country' ); + $properties->{ code } = $user->get( $copyFrom . 'Zip' ); + $properties->{ phoneNumber } = $user->get( $copyFrom . 'Phone' ); + $properties->{ email } = $user->get( 'email' ); + $properties->{ organization } = $user->get( 'workName' ) if $copyFrom eq 'work'; } # Setup tmpl_vars diff --git a/lib/WebGUI/Shop/Cart.pm b/lib/WebGUI/Shop/Cart.pm index 00b48eee2..accad3fb5 100644 --- a/lib/WebGUI/Shop/Cart.pm +++ b/lib/WebGUI/Shop/Cart.pm @@ -1016,7 +1016,7 @@ sub www_lookupPosUser { unless (defined $user) { $user = WebGUI::User->new($session, "new"); $user->username($email); - $user->profileField('email', $email); + $user->get('email', $email); } } $self->update({posUserId=>$user->userId}); diff --git a/lib/WebGUI/TabForm.pm b/lib/WebGUI/TabForm.pm index 5e62499a7..04f8b0571 100644 --- a/lib/WebGUI/TabForm.pm +++ b/lib/WebGUI/TabForm.pm @@ -242,7 +242,7 @@ sub print { my $i = 1; my $tabs = '