oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change occurances of user->profileField to user->get

Browse source
This commit is contained in:
Colin Kuskie 2010-11-18 16:12:03 -08:00
parent ae48e7517a
commit 59c03b50e7
41 changed files with 86 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Account/FriendManager.pm
View file

@ -227,7 +227,7 @@ sub www_editFriends {
##We don't use acceptsFriendsRequests here because it's overkill. ##We don't use acceptsFriendsRequests here because it's overkill.
##No need to check invitations, since friends are managed. ##No need to check invitations, since friends are managed.
##Existing friends are already filtered out. ##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 ]; push @usersToAdd, [ $newFriendId, $user->username ];
} }

6
lib/WebGUI/Account/Friends.pm
View file

@ -66,11 +66,11 @@ sub canView {
my $session = $self->session; my $session = $self->session;
my $uid = $self->uid; 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); my $user = WebGUI::User->new($session,$uid);
return 0 if($user->isVisitor); #This should never happen but let's make sure 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 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 ""; my $displayView = $uid ne "";
$var->{'display_message'} = $msg; $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 $i18n = WebGUI::International->new($session,"Account_Friends");
my $errorMsg = ""; my $errorMsg = "";
if($var->{'can_edit'}) { if($var->{'can_edit'}) {

4
lib/WebGUI/Account/Inbox.pm
View file

@ -59,7 +59,7 @@ sub appendCommonVars {
$var->{'view_invitations_url' } = $self->getUrl("module=inbox;do=manageInvitations"); $var->{'view_invitations_url' } = $self->getUrl("module=inbox;do=manageInvitations");
$var->{'unread_message_count' } = $inbox->getUnreadMessageCount($user->userId); $var->{'unread_message_count' } = $inbox->getUnreadMessageCount($user->userId);
$var->{'invitation_count' } = $self->getInvitationCount; $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->{'user_invitations_enabled'} = $session->setting->get("inboxInviteUserEnabled");
$var->{'invite_friend_url' } = $self->getUrl("module=inbox;do=inviteUser"); $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; return $self->www_inviteUser($i18n->get('missing message')) unless $message;
#Profile Email address check #Profile Email address check
my $email = $session->user->profileField('email'); my $email = $session->user->get('email');
unless ($email) { unless ($email) {
return $self->www_inviteUser($i18n->get('no email')); return $self->www_inviteUser($i18n->get('no email'));
} }

10
lib/WebGUI/Account/Profile.pm
View file

@ -113,7 +113,7 @@ sub appendCommonVars {
$self->SUPER::appendCommonVars($var); $self->SUPER::appendCommonVars($var);
$var->{'edit_profile_url' } = $self->getUrl("module=profile;do=edit"); $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'} = []; $var->{'profile_category_loop'} = [];
#Append the categories #Append the categories
@ -244,7 +244,7 @@ sub getExtrasStyle {
return $errorStyle if $field->getId ~~ $fieldErrors; return $errorStyle if $field->getId ~~ $fieldErrors;
return "" unless ($field->isRequired); 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; return $requiredStyleOff;
} }
@ -359,7 +359,7 @@ sub www_edit {
foreach my $field (@{ $category->getFields( { editable => 1 } ) }) { foreach my $field (@{ $category->getFields( { editable => 1 } ) }) {
my $fieldId = $field->getId; my $fieldId = $field->getId;
my $fieldLabel = $field->getLabel; 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 $fieldRequired = $field->isRequired;
my $fieldExtras = $field->getExtras; my $fieldExtras = $field->getExtras;
my $fieldViewable = $field->isViewable; my $fieldViewable = $field->isViewable;
@ -472,7 +472,7 @@ sub www_view {
$self->appendCommonVars($var); $self->appendCommonVars($var);
my $privacySetting = $user->profileField('publicProfile') || 'none'; my $privacySetting = $user->get('publicProfile') || 'none';
$var->{"profile_privacy_$privacySetting"} = "true"; $var->{"profile_privacy_$privacySetting"} = "true";
$var->{'acceptsPrivateMessages'} $var->{'acceptsPrivateMessages'}
@ -501,7 +501,7 @@ sub www_view {
my $fieldId = $field->getId; my $fieldId = $field->getId;
my $fieldLabel = $field->getLabel; my $fieldLabel = $field->getLabel;
my $fieldValue = $field->formField(undef,2,$user); 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 #Create a seperate template var for each field
my $fieldBase = 'profile_field_'.$fieldId; my $fieldBase = 'profile_field_'.$fieldId;
$var->{$fieldBase.'_label' } = $fieldLabel; $var->{$fieldBase.'_label' } = $fieldLabel;

4
lib/WebGUI/Admin.pm
View file

@ -99,7 +99,7 @@ sub getAdminPluginTemplateVars {
elsif ( defined $funcDef->{groupSetting} ) { elsif ( defined $funcDef->{groupSetting} ) {
$canUse = $user->isInGroup( $setting->get( $funcDef->{groupSetting} ) ); $canUse = $user->isInGroup( $setting->get( $funcDef->{groupSetting} ) );
} }
if ( $funcDef->{uiLevel} > $user->profileField("uiLevel") ) { if ( $funcDef->{uiLevel} > $user->get("uiLevel") ) {
$canUse = 0; $canUse = 0;
} }
next unless $canUse; next unless $canUse;
@ -227,7 +227,7 @@ sub getNewContentTemplateVars {
# Build the categories # Build the categories
my %rawCategories = %{ $config->get('assetCategories') }; my %rawCategories = %{ $config->get('assetCategories') };
my %categories; # All the categories we have my %categories; # All the categories we have
my $userUiLevel = $user->profileField('uiLevel'); my $userUiLevel = $user->get('uiLevel');
foreach my $category ( keys %rawCategories ) { foreach my $category ( keys %rawCategories ) {
# Check the ui level # Check the ui level
next if $rawCategories{$category}{uiLevel} > $userUiLevel; next if $rawCategories{$category}{uiLevel} > $userUiLevel;

2
lib/WebGUI/AdminConsole.pm
View file

@ -169,7 +169,7 @@ sub getAdminFunction {
elsif (defined $functions->{$function}{groupSetting}) { elsif (defined $functions->{$function}{groupSetting}) {
$canUse = $user->isInGroup($setting->get($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; $canUse = 0;
} }

4
lib/WebGUI/Asset.pm
View file

@ -1484,7 +1484,7 @@ sub getPrototypeList {
} }
my $db = $session->db; my $db = $session->db;
my @prototypeIds = $db->buildArray("select distinct assetId from assetData where isPrototype=1"); 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; my @assets;
ID: foreach my $id (@prototypeIds) { ID: foreach my $id (@prototypeIds) {
my $asset = WebGUI::Asset->newById($session, $id); my $asset = WebGUI::Asset->newById($session, $id);
@ -1598,7 +1598,7 @@ sub getToolbar {
return undef unless $self->canEdit && $self->session->isAdminOn; return undef unless $self->canEdit && $self->session->isAdminOn;
return $self->{_toolbar} return $self->{_toolbar}
if (exists $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 $uiLevels = $self->session->config->get("assetToolbarUiLevel");
my $i18n = WebGUI::International->new($self->session, "Asset"); my $i18n = WebGUI::International->new($self->session, "Asset");
my $toolbar = ""; my $toolbar = "";

4
lib/WebGUI/Asset/MatrixListing.pm
View file

@ -741,7 +741,7 @@ sub view {
$mailForm->email( $mailForm->email(
-extras =>'class="content"', -extras =>'class="content"',
-name =>"from", -name =>"from",
-value =>$session->user->profileField("email"), -value =>$session->user->get("email"),
-label =>$i18n->get('your email label'), -label =>$i18n->get('your email label'),
); );
$mailForm->selectBox( $mailForm->selectBox(
@ -1020,7 +1020,7 @@ sub www_sendEmail {
if ($form->process("body") ne "") { if ($form->process("body") ne "") {
my $user = WebGUI::User->new($self->session, $self->get('maintainerId')); my $user = WebGUI::User->new($self->session, $self->get('maintainerId'));
my $mail = WebGUI::Mail::Send->create($self->session,{ my $mail = WebGUI::Mail::Send->create($self->session,{
to =>$user->profileField("email"), to =>$user->get("email"),
subject =>$self->get('productName')." - ".$form->process("subject"), subject =>$self->get('productName')." - ".$form->process("subject"),
from=>$form->process("from") from=>$form->process("from")
}); });

12
lib/WebGUI/Asset/Post.pm
View file

@ -42,7 +42,7 @@ property username => (
sub _username_builder { sub _username_builder {
my $session = shift->session; my $session = shift->session;
return $session->form->process("visitorUsername") return $session->form->process("visitorUsername")
|| $session->user->profileField("alias") || $session->user->get("alias")
|| $session->user->username; || $session->user->username;
} }
property rating => ( property rating => (
@ -476,7 +476,7 @@ sub getAvatarUrl {
return '' unless $parent and $parent->avatarsEnabled; return '' unless $parent and $parent->avatarsEnabled;
my $user = WebGUI::User->new($self->session, $self->ownerUserId); my $user = WebGUI::User->new($self->session, $self->ownerUserId);
#Get avatar field, storage Id. #Get avatar field, storage Id.
my $storageId = $user->profileField("avatar"); my $storageId = $user->get("avatar");
return '' unless $storageId; return '' unless $storageId;
my $avatar = WebGUI::Storage->get($self->session,$storageId); my $avatar = WebGUI::Storage->get($self->session,$storageId);
my $avatarUrl = ''; my $avatarUrl = '';
@ -963,7 +963,7 @@ sub notifySubscribers {
my $companyAddress = $setting->get("companyEmail"); my $companyAddress = $setting->get("companyEmail");
my $listAddress = $cs->mailAddress; my $listAddress = $cs->mailAddress;
my $posterAddress = $user->getProfileFieldPrivacySetting('email') eq "all" my $posterAddress = $user->getProfileFieldPrivacySetting('email') eq "all"
? $user->profileField('email') ? $user->get('email')
: ''; : '';
my $from = $posterAddress || $listAddress || $companyAddress; my $from = $posterAddress || $listAddress || $companyAddress;
my $replyTo = $listAddress || $returnAddress || $companyAddress; my $replyTo = $listAddress || $returnAddress || $companyAddress;
@ -1079,7 +1079,7 @@ override processEditForm => sub {
if ($form->process("assetId") eq "new") { if ($form->process("assetId") eq "new") {
my %data = ( my %data = (
ownerUserId => $session->user->userId, 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); $self->update(\%data);
} }
@ -1132,7 +1132,7 @@ sub postProcess {
} }
my $i18n = WebGUI::International->new($self->session, "Asset_Post"); my $i18n = WebGUI::International->new($self->session, "Asset_Post");
if ($self->getThread->getParent->get("addEditStampToPosts")) { if ($self->getThread->getParent->get("addEditStampToPosts")) {
$data{content} .= "<p>\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->profileField("alias").") --- \n</p>"; $data{content} .= "<p>\n\n --- (".$i18n->get('Edited_on')." ".$self->session->datetime->epochToHuman(undef,"%z %Z [GMT%O]")." ".$i18n->get('By')." ".$self->session->user->get("alias").") --- \n</p>";
} }
$data{url} = $self->fixUrl($self->getThread->url."/1") if ($self->isReply && $self->isNew); $data{url} = $self->fixUrl($self->getThread->url."/1") if ($self->isReply && $self->isNew);
$data{groupIdView} = $self->getThread->getParent->groupIdView; $data{groupIdView} = $self->getThread->getParent->groupIdView;
@ -1556,7 +1556,7 @@ sub www_edit {
value => defined $subscribe ? $subscribe : 1, 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 else { # edit
return $privilege->insufficient() unless ($self->canEdit); return $privilege->insufficient() unless ($self->canEdit);

2
lib/WebGUI/Asset/Post/Thread.pm
View file

@ -1086,7 +1086,7 @@ sub view {
return $out if $out; return $out if $out;
} }
$self->session->scratch->set("discussionLayout",$self->session->form->process("layout")) if ($self->session->form->process("layout")); $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; my $var = $self->getTemplateVars;
$self->getParent->appendTemplateLabels($var); $self->getParent->appendTemplateLabels($var);

2
lib/WebGUI/Asset/Template/Parser.pm
View file

@ -37,7 +37,7 @@ sub addSessionVars {
# These are the only session template variables used in the core as # These are the only session template variables used in the core as
# of 6.8.5. Further use of session template vars is deprecated. # of 6.8.5. Further use of session template vars is deprecated.
$vars->{"session.user.username"} = $self->session->user->username; $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.config.extrasurl"} = $self->session->url->extras();
$vars->{"session.var.adminOn"} = $self->session->isAdminOn; $vars->{"session.var.adminOn"} = $self->session->isAdminOn;
$vars->{"session.setting.companyName"} = $self->session->setting->get("companyName"); $vars->{"session.setting.companyName"} = $self->session->setting->get("companyName");

2
lib/WebGUI/Asset/WikiPage.pm
View file

@ -519,7 +519,7 @@ sub www_getHistory {
.$icon->edit('func=edit;revision='.$revision->revisionDate, $revision->url) .$icon->edit('func=edit;revision='.$revision->revisionDate, $revision->url)
.$icon->view('func=view;revision='.$revision->revisionDate, $revision->url), .$icon->view('func=view;revision='.$revision->revisionDate, $revision->url),
date => $date->epochToHuman($revision->revisionDate), date => $date->epochToHuman($revision->revisionDate),
username => $user->profileField('alias') || $user->username, username => $user->get('alias') || $user->username,
actionTaken => $revision->actionTaken, actionTaken => $revision->actionTaken,
interval => join(" ", $date->secondsToInterval(time() - $revision->revisionDate)) interval => join(" ", $date->secondsToInterval(time() - $revision->revisionDate))
}); });

4
lib/WebGUI/Asset/Wobject/Calendar.pm
View file

@ -1200,7 +1200,7 @@ sub viewMonth {
#### Create the template parameters #### Create the template parameters
## The grid ## The grid
my $first_dow = $session->user->profileField("firstDayOfWeek") || 0; my $first_dow = $session->user->get("firstDayOfWeek") || 0;
# 0 - sunday # 0 - sunday
# 1 - mon # 1 - mon
# 2 - tue # 2 - tue
@ -1333,7 +1333,7 @@ sub viewWeek {
$dt->truncate( to => "day"); $dt->truncate( to => "day");
# Apply First Day of Week settings # Apply First Day of Week settings
my $first_dow = $session->user->profileField("firstDayOfWeek") || 0; my $first_dow = $session->user->get("firstDayOfWeek") || 0;
# 0 - sunday # 0 - sunday
# 1 - monday # 1 - monday
# 2 - tuesday, etc... # 2 - tuesday, etc...

2
lib/WebGUI/Asset/Wobject/Navigation.pm
View file

@ -311,7 +311,7 @@ override getToolbar => sub {
if ($self->getToolbarState) { if ($self->getToolbarState) {
my $toolbar = ''; my $toolbar = '';
if ($self->canEditIfLocked) { 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 $uiLevels = $self->session->config->get("assetToolbarUiLevel");
my $returnUrl = ''; my $returnUrl = '';
if ($self->session->asset) { if ($self->session->asset) {

2
lib/WebGUI/Asset/Wobject/ProjectManager.pm
View file

@ -263,7 +263,7 @@ sub _htmlOfResourceList {
$subvar->{resourceIcon} = 'groups.gif'; $subvar->{resourceIcon} = 'groups.gif';
} elsif ($resourceKind eq 'user') { } elsif ($resourceKind eq 'user') {
my $user = WebGUI::User->new($self->session, $resourceId); 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 { my $displayName = do {
if (length($firstName) && length($lastName)) { "$lastName, $firstName" } if (length($firstName) && length($lastName)) { "$lastName, $firstName" }
elsif (length($firstName)) { $firstName } elsif (length($firstName)) { $firstName }

2
lib/WebGUI/Asset/Wobject/StoryArchive.pm
View file

@ -572,7 +572,7 @@ sub viewTemplateVariables {
my $datePointer = undef; my $datePointer = undef;
my $icon = $session->icon; my $icon = $session->icon;
my $userUiLevel = $session->user->profileField("uiLevel"); my $userUiLevel = $session->user->get("uiLevel");
my $uiLevels = $session->config->get('assetToolbarUiLevel'); my $uiLevels = $session->config->get('assetToolbarUiLevel');
##Only build objects for the assets that we need ##Only build objects for the assets that we need

2
lib/WebGUI/Asset/Wobject/StoryTopic.pm
View file

@ -174,7 +174,7 @@ sub viewTemplateVariables {
$var->{story_loop} = []; $var->{story_loop} = [];
my $icon = $session->icon; my $icon = $session->icon;
my $userUiLevel = $session->user->profileField("uiLevel"); my $userUiLevel = $session->user->get("uiLevel");
my $uiLevels = $session->config->get('assetToolbarUiLevel'); my $uiLevels = $session->config->get('assetToolbarUiLevel');
my $i18n = WebGUI::International->new($session); my $i18n = WebGUI::International->new($session);

6
lib/WebGUI/Auth.pm
View file

@ -1192,7 +1192,7 @@ sub www_login {
# Set the proper redirect # Set the proper redirect
if ( $self->session->setting->get( 'showMessageOnLogin' ) if ( $self->session->setting->get( 'showMessageOnLogin' )
&& $self->user->profileField( $LOGIN_MESSAGE_SEEN ) && $self->user->get( $LOGIN_MESSAGE_SEEN )
< $self->session->setting->get( 'showMessageOnLoginTimes' ) < $self->session->setting->get( 'showMessageOnLoginTimes' )
) { ) {
return $self->showMessageOnLogin; return $self->showMessageOnLogin;
@ -1264,8 +1264,8 @@ sub www_showMessageOnLogin {
my $i18n = WebGUI::International->new( $self->session, 'Auth' ); my $i18n = WebGUI::International->new( $self->session, 'Auth' );
# Increment the number of time seen. # Increment the number of time seen.
$self->user->profileField( $LOGIN_MESSAGE_SEEN, $self->user->get( $LOGIN_MESSAGE_SEEN,
$self->user->profileField( $LOGIN_MESSAGE_SEEN ) + 1 $self->user->get( $LOGIN_MESSAGE_SEEN ) + 1
); );
# Show the message, processing for macros # Show the message, processing for macros

6
lib/WebGUI/Auth/Facebook.pm
View file

@ -46,9 +46,9 @@ sub createFacebookUser {
my ( $self, $fbuser ) = @_; my ( $self, $fbuser ) = @_;
my $user = WebGUI::User->create( $self->session ); my $user = WebGUI::User->create( $self->session );
$user->username( $fbuser->{name} ); $user->username( $fbuser->{name} );
$user->profileField('email', $fbuser->{email}); $user->get('email', $fbuser->{email});
$user->profileField('firstName', $fbuser->{first_name}); $user->get('firstName', $fbuser->{first_name});
$user->profileField('lastName', $fbuser->{last_name}); $user->get('lastName', $fbuser->{last_name});
$self->update( $self->update(
"facebookUserId" => $fbuser->{id}, "facebookUserId" => $fbuser->{id},
); );

2
lib/WebGUI/Auth/LDAP.pm
View file

@ -687,7 +687,7 @@ sub www_displayAccount {
$vars->{displayTitle} = '<h1>'.$i18n->get(61).'</h1>'; $vars->{displayTitle} = '<h1>'.$i18n->get(61).'</h1>';
$vars->{'account.message'} = $i18n->get(856); $vars->{'account.message'} = $i18n->get(856);
if($self->session->setting->get("useKarma")){ 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); $vars->{'account.form.karma.label'} = $i18n->get(537);
} }

2
lib/WebGUI/Auth/WebGUI.pm
View file

@ -1113,7 +1113,7 @@ sub www_emailRecoverPasswordFinish {
# generate information necessry to proceed # generate information necessry to proceed
my $recoveryGuid = $session->id->generate(); my $recoveryGuid = $session->id->generate();
my $userId = $user->userId; #get the user guid my $userId = $user->userId; #get the user guid
$email = $user->profileField('email'); $email = $user->get('email');
if ( ! $email ) { if ( ! $email ) {
return $self->www_recoverPassword( $i18n->get( 'no email address', 'AuthWebGUI' ) ); return $self->www_recoverPassword( $i18n->get( 'no email address', 'AuthWebGUI' ) );

2
lib/WebGUI/Content/AssetManager.pm
View file

@ -164,7 +164,7 @@ Gets the "More" menu with the specified label.
sub getMoreMenu { sub getMoreMenu {
my $session = shift; my $session = shift;
my $label = shift || "More"; my $label = shift || "More";
my $userUiLevel = $session->user->profileField("uiLevel"); my $userUiLevel = $session->user->get("uiLevel");
my $toolbarUiLevel = $session->config->get("assetToolbarUiLevel"); my $toolbarUiLevel = $session->config->get("assetToolbarUiLevel");
my $i18n = WebGUI::International->new( $session, "Asset" ); my $i18n = WebGUI::International->new( $session, "Asset" );

2
lib/WebGUI/Form/Control.pm
View file

@ -572,7 +572,7 @@ Renders the form field to HTML as a table row complete with labels, subtext, hov
sub passUiLevelCheck { sub passUiLevelCheck {
my $self = shift; my $self = shift;
my $user = $self->session->user; my $user = $self->session->user;
return $self->get("uiLevel") <= $user->profileField("uiLevel") || $user->isAdmin; return $self->get("uiLevel") <= $user->get("uiLevel") || $user->isAdmin;
} }

2
lib/WebGUI/Form/Date.pm
View file

@ -154,7 +154,7 @@ sub getValue {
# NOTE: Cannot fix time zone since we don't have a complete date/time # NOTE: Cannot fix time zone since we don't have a complete date/time
if($value =~ $isaEpoch){ 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 # Verify format

6
lib/WebGUI/Form/DateTime.pm
View file

@ -93,7 +93,7 @@ sub definition {
defaultValue=> 19 defaultValue=> 19
}, },
timeZone=>{ timeZone=>{
defaultValue=> $session->user->profileField("timeZone") defaultValue=> $session->user->get("timeZone")
}, },
}); });
return $class->SUPER::definition($session, $definition); return $class->SUPER::definition($session, $definition);
@ -153,7 +153,7 @@ sub getValue {
# YY(YY)?-MM-DD HH:MM:SS # YY(YY)?-MM-DD HH:MM:SS
if($value =~ $isaEpoch){ 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 # Verify format
@ -162,7 +162,7 @@ sub getValue {
# Fix time zone # 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; ->set_time_zone("UTC")->toMysql;
return $value; return $value;

2
lib/WebGUI/HTMLForm.pm
View file

@ -61,7 +61,7 @@ These methods are available from this class:
#------------------------------------------------------------------- #-------------------------------------------------------------------
sub _uiLevelChecksOut { sub _uiLevelChecksOut {
my $self = shift; my $self = shift;
if ($_[0] <= $self->session->user->profileField("uiLevel")) { if ($_[0] <= $self->session->user->get("uiLevel")) {
return 1; return 1;
} }
else { else {

2
lib/WebGUI/Macro/AdminBar.pm
View file

@ -111,7 +111,7 @@ sub process {
my %rawCategories = %{$config->get('assetCategories')}; my %rawCategories = %{$config->get('assetCategories')};
my %categories; my %categories;
my %categoryTitles; my %categoryTitles;
my $userUiLevel = $user->profileField('uiLevel'); my $userUiLevel = $user->get('uiLevel');
foreach my $category (keys %rawCategories) { foreach my $category (keys %rawCategories) {
next if $rawCategories{$category}{uiLevel} > $userUiLevel; next if $rawCategories{$category}{uiLevel} > $userUiLevel;
next if (exists $rawCategories{$category}{group} && !$user->isInGroup($rawCategories{$category}{group})); next if (exists $rawCategories{$category}{group} && !$user->isInGroup($rawCategories{$category}{group}));

4
lib/WebGUI/Macro/ConvertUTCToTZ.pm
View file

@ -60,8 +60,8 @@ time - time component formatted as HH:MM:SS
sub process { sub process {
my ( $session, $toTZ, $format, $date, $time ) = @_; my ( $session, $toTZ, $format, $date, $time ) = @_;
my $uTZ = $session->user->profileField("timeZone"); my $uTZ = $session->user->get("timeZone");
my $uFormat = $session->user->profileField("dateFormat"); my $uFormat = $session->user->get("dateFormat");
$toTZ ||= $uTZ; $toTZ ||= $uTZ;
$format ||= $uFormat; $format ||= $uFormat;

2
lib/WebGUI/Macro/PickLanguage.pm
View file

@ -52,7 +52,7 @@ sub process {
my $languages = $i18n->getLanguages(); my $languages = $i18n->getLanguages();
my $currentLanguage = $session->scratch->get('language') my $currentLanguage = $session->scratch->get('language')
? $session->scratch->get('language') ? $session->scratch->get('language')
: $session->user->profileField('language'); : $session->user->get('language');
my @lang_loop = (); my @lang_loop = ();
foreach my $language ( keys %$languages ) { foreach my $language ( keys %$languages ) {
my $isCurrentLanguage = $currentLanguage eq $language ? 1 : 0; my $isCurrentLanguage = $currentLanguage eq $language ? 1 : 0;

2
lib/WebGUI/Macro/User.pm
View file

@ -50,7 +50,7 @@ sub process {
: $session->user : $session->user
; ;
return $user->profileField($field); return $user->get($field);
} }
1; 1;

18
lib/WebGUI/Macro/UsersOnline.pm
View file

@ -85,7 +85,7 @@ sub process {
# Obtain internationalization instance # Obtain internationalization instance
my $i18n = WebGUI::International->new($session, "Macro_UsersOnline"); my $i18n = WebGUI::International->new($session, "Macro_UsersOnline");
# Get preferred time format of current user # 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 # Calculate epoch time for comparison to last activity
my $dt = $session->datetime; my $dt = $session->datetime;
@ -165,7 +165,7 @@ sub _visitors {
my $db = $session->db(); my $db = $session->db();
my $dt = $session->datetime; my $dt = $session->datetime;
# Get preferred time format of current user # 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 # SQL conditional clause for filtering server IP
my $ip_clause; my $ip_clause;
@ -249,7 +249,7 @@ sub _members {
my $db = $session->db(); my $db = $session->db();
my $dt = $session->datetime; my $dt = $session->datetime;
# Get preferred time format of current user # 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 # Determine the number of registered users that are online. The Admin
# account is excluded from the list. # account is excluded from the list.
@ -269,10 +269,10 @@ sub _members {
my $user = WebGUI::User->new($session, $row{'userId'}); my $user = WebGUI::User->new($session, $row{'userId'});
# Only show users with the "showOnline" flag set to true # Only show users with the "showOnline" flag set to true
if ($user->profileField("showOnline")) { if ($user->get("showOnline")) {
# Find URL of avatar if available # Find URL of avatar if available
my $avatar_url; my $avatar_url;
my $avatar = $user->profileField("avatar"); my $avatar = $user->get("avatar");
if ($avatar) { if ($avatar) {
my $storage = WebGUI::Storage->get($session, $avatar); my $storage = WebGUI::Storage->get($session, $avatar);
my @files = @{ $storage->getFiles() }; my @files = @{ $storage->getFiles() };
@ -284,10 +284,10 @@ sub _members {
# Add item to member template loop # Add item to member template loop
push(@{$var->{'member_loop'}}, { push(@{$var->{'member_loop'}}, {
username => $user->username(), username => $user->username(),
firstName => $user->profileField("firstName"), firstName => $user->get("firstName"),
middleName => $user->profileField("middleName"), middleName => $user->get("middleName"),
lastName => $user->profileField("lastName"), lastName => $user->get("lastName"),
alias => $user->profileField("alias"), alias => $user->get("alias"),
avatar => $avatar_url, avatar => $avatar_url,
uid => $row{'userId'}, uid => $row{'userId'},
sessionId => $row{'sessionId'}, sessionId => $row{'sessionId'},

4
lib/WebGUI/Mail/Send.pm
View file

@ -332,7 +332,7 @@ sub create {
$email = $user->getInboxNotificationAddresses; $email = $user->getInboxNotificationAddresses;
} }
else { else {
$email = $user->profileField("email"); $email = $user->get("email");
} }
if ($email) { if ($email) {
if ($headers->{to}) { if ($headers->{to}) {
@ -568,7 +568,7 @@ sub send {
$emailAddress = $user->getInboxNotificationAddresses; $emailAddress = $user->getInboxNotificationAddresses;
} }
else { else {
$emailAddress = $user->profileField('email'); $emailAddress = $user->get('email');
} }
next USER unless $emailAddress; next USER unless $emailAddress;
$mail->head->replace('To', $emailAddress); $mail->head->replace('To', $emailAddress);

2
lib/WebGUI/Operation/Help.pm
View file

@ -291,7 +291,7 @@ sub www_viewHelp {
else { else {
$vars{body} = $i18n->get($help->{body}) if $help->{body}; ##Body entry is optional $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"); my $uiOverride = $session->form->process("uiOverride");
foreach my $row (@{ $help->{fields} }) { foreach my $row (@{ $help->{fields} }) {
push @{ $vars{fields} }, push @{ $vars{fields} },

2
lib/WebGUI/Role/Asset/Comments.pm
View file

@ -84,7 +84,7 @@ sub addComment {
my $comments = $self->get('comments'); my $comments = $self->get('comments');
push @$comments, { push @$comments, {
id => $session->id->generate, id => $session->id->generate,
alias => $user->profileField('alias'), alias => $user->get('alias'),
userId => $user->userId, userId => $user->userId,
comment => $comment, comment => $comment,
rating => $rating, rating => $rating,

8
lib/WebGUI/Session/DateTime.pm
View file

@ -292,7 +292,7 @@ sub epochToHuman {
$epoch = time(); $epoch = time();
} }
my $i18n = WebGUI::International->new($self->session); 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'; my $locale = $language->{languageAbbreviation} || 'en';
$locale .= "_".$language->{locale} if ($language->{locale}); $locale .= "_".$language->{locale} if ($language->{locale});
my $time_zone = $self->getTimeZone(); my $time_zone = $self->getTimeZone();
@ -300,10 +300,10 @@ sub epochToHuman {
my $output = shift || "%z %Z"; my $output = shift || "%z %Z";
my $temp; my $temp;
#---date format preference #---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; $output =~ s/\%z/$temp/g;
#---time format preference #---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; $output =~ s/\%Z/$temp/g;
#--- convert WebGUI date formats to DateTime formats #--- convert WebGUI date formats to DateTime formats
my %conversion = ( my %conversion = (
@ -609,7 +609,7 @@ sub getTimeZone {
return 'America/Chicago' unless defined $self->session->db(1); return 'America/Chicago' unless defined $self->session->db(1);
return $self->session->user->{_timeZone} if $self->session->user->{_timeZone}; return $self->session->user->{_timeZone} if $self->session->user->{_timeZone};
my @zones = @{DateTime::TimeZone::all_names()}; my @zones = @{DateTime::TimeZone::all_names()};
my $zone = $self->session->user->profileField('timeZone'); my $zone = $self->session->user->get('timeZone');
$zone =~ s/ /\_/g; $zone =~ s/ /\_/g;
if ($zone) { if ($zone) {
if ( $zone ~~ @zones ) { if ( $zone ~~ @zones ) {

4
lib/WebGUI/Session/Icon.pm
View file

@ -64,11 +64,11 @@ Returns the base URL for this user's toolbar icon set.
sub getBaseURL { sub getBaseURL {
my $self = shift; my $self = shift;
my $url = $self->session->url->extras('toolbar/'); 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") { if ($toolbar ne "useLanguageDefault") {
$url .= $toolbar; $url .= $toolbar;
} else { } 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 .= '/'; $url .= '/';
return $url; return $url;

20
lib/WebGUI/Shop/AddressBook.pm
View file

@ -614,17 +614,17 @@ sub www_editAddress {
if ( $copyFrom eq 'work' || $copyFrom eq 'home' ) { if ( $copyFrom eq 'work' || $copyFrom eq 'home' ) {
my $user = $session->user; my $user = $session->user;
$properties->{ address1 } = $user->profileField( $copyFrom . 'Address' ); $properties->{ address1 } = $user->get( $copyFrom . 'Address' );
$properties->{ firstName } = $user->profileField( 'firstName' ); $properties->{ firstName } = $user->get( 'firstName' );
$properties->{ lastName } = $properties->{ lastName } =
join ' ', $user->profileField( 'middleName' ), $user->profileField( 'lastName' ); join ' ', $user->get( 'middleName' ), $user->get( 'lastName' );
$properties->{ city } = $user->profileField( $copyFrom . 'City' ); $properties->{ city } = $user->get( $copyFrom . 'City' );
$properties->{ state } = $user->profileField( $copyFrom . 'State' ); $properties->{ state } = $user->get( $copyFrom . 'State' );
$properties->{ country } = $user->profileField( $copyFrom . 'Country' ); $properties->{ country } = $user->get( $copyFrom . 'Country' );
$properties->{ code } = $user->profileField( $copyFrom . 'Zip' ); $properties->{ code } = $user->get( $copyFrom . 'Zip' );
$properties->{ phoneNumber } = $user->profileField( $copyFrom . 'Phone' ); $properties->{ phoneNumber } = $user->get( $copyFrom . 'Phone' );
$properties->{ email } = $user->profileField( 'email' ); $properties->{ email } = $user->get( 'email' );
$properties->{ organization } = $user->profileField( 'workName' ) if $copyFrom eq 'work'; $properties->{ organization } = $user->get( 'workName' ) if $copyFrom eq 'work';
} }
# Setup tmpl_vars # Setup tmpl_vars

2
lib/WebGUI/Shop/Cart.pm
View file

@ -1016,7 +1016,7 @@ sub www_lookupPosUser {
unless (defined $user) { unless (defined $user) {
$user = WebGUI::User->new($session, "new"); $user = WebGUI::User->new($session, "new");
$user->username($email); $user->username($email);
$user->profileField('email', $email); $user->get('email', $email);
} }
} }
$self->update({posUserId=>$user->userId}); $self->update({posUserId=>$user->userId});

2
lib/WebGUI/TabForm.pm
View file

@ -242,7 +242,7 @@ sub print {
my $i = 1; my $i = 1;
my $tabs = '<ul class="yui-nav">'; my $tabs = '<ul class="yui-nav">';
my $form = '<div class="yui-content">'; my $form = '<div class="yui-content">';
my $userUiLevel = $self->session->user->profileField("uiLevel"); my $userUiLevel = $self->session->user->get("uiLevel");
my $first = 1; my $first = 1;
foreach my $key (keys %{$self->{_tab}}) { foreach my $key (keys %{$self->{_tab}}) {
my $hide = ''; my $hide = '';

2
lib/WebGUI/Workflow/Activity/GetCsMail.pm
View file

@ -104,7 +104,7 @@ sub addPost {
url=>$parent->get("url")."/".$title, url=>$parent->get("url")."/".$title,
content=>$content, content=>$content,
ownerUserId=>$user->userId, ownerUserId=>$user->userId,
username=>$user->profileField("alias") || $user->username, username=>$user->get("alias") || $user->username,
originalEmail=>join("",@{$message->{rawMessage}}), originalEmail=>join("",@{$message->{rawMessage}}),
}); });
if (scalar(@attachments)) { if (scalar(@attachments)) {

2
lib/WebGUI/Workflow/Activity/SyncProfilesToLdap.pm
View file

@ -173,7 +173,7 @@ sub execute {
my $value = $entry->get_value($self->_alias($fieldName)); my $value = $entry->get_value($self->_alias($fieldName));
next unless length $value; next unless length $value;
# $self->session->log->warn("DEBUG: SyncProfilesToLdap: Got data for profile field '$fieldName'"); # $self->session->log->warn("DEBUG: SyncProfilesToLdap: Got data for profile field '$fieldName'");
$user->profileField($fieldName, $value); $user->get($fieldName, $value);
} }
} }
} continue { } continue {