From ee5ccfad26accbdfa13f829fac231996c1fd4de5 Mon Sep 17 00:00:00 2001 From: JT Smith Date: Fri, 13 Jan 2006 21:47:38 +0000 Subject: [PATCH] more bug fixes --- lib/WebGUI/Session.pm | 10 ++--- lib/WebGUI/Session/DateTime.pm | 10 ++--- lib/WebGUI/Session/Form.pm | 2 +- lib/WebGUI/Session/Http.pm | 4 +- lib/WebGUI/Session/Icon.pm | 72 +++++++++++++++++----------------- 5 files changed, 49 insertions(+), 49 deletions(-) diff --git a/lib/WebGUI/Session.pm b/lib/WebGUI/Session.pm index 6e07f6a54..f37034d58 100644 --- a/lib/WebGUI/Session.pm +++ b/lib/WebGUI/Session.pm @@ -169,7 +169,7 @@ sub dbSlave { } } } - if ($session->var("adminOn") || !exists $self->{_slave}) { + if ($self->var("adminOn") || !exists $self->{_slave}) { return $self->db; } else { return $self->{_slave}->[rand @{$self->{_slave}}]; @@ -374,7 +374,7 @@ Returns a WebGUI::Session::Privilege object. sub privilege { my $self = shift; unless (exists $self->{_privilege}) { - $self->{_privilege} = WebGUI::Session::Privilege->new($session); + $self->{_privilege} = WebGUI::Session::Privilege->new($self); } return $self->{_privilege}; } @@ -517,9 +517,9 @@ sub user { $self->db->write("update passiveProfileLog set userId = ".$self->db->quote($self->{_var}{userId})." where sessionId = ".$self->db->quote($self->getId)); } delete $self->{_stow}; - $self->{_user} = $option->{user} || WebGUI::User->new($session, $self->{_var}{userId}); + $self->{_user} = $option->{user} || WebGUI::User->new($self, $self->{_var}{userId}); } elsif (!exists $self->{_user}) { - $self->{_user} = WebGUI::User->new($session, $self->{_var}{userId}); + $self->{_user} = WebGUI::User->new($self, $self->{_var}{userId}); } $self->{_request}->user($self->{_user}->username) if ($self->{_request}); return $self->{_user}; @@ -537,7 +537,7 @@ Returns a reference to the WebGUI::Session::Var object. sub var { my $self = shift; unless ($self->{_var}) { - $self->{_var} = WebGUI::Session::Var->new($session); + $self->{_var} = WebGUI::Session::Var->new($self); } return $self->{_var}; } diff --git a/lib/WebGUI/Session/DateTime.pm b/lib/WebGUI/Session/DateTime.pm index b43ceb4bf..708d8688e 100644 --- a/lib/WebGUI/Session/DateTime.pm +++ b/lib/WebGUI/Session/DateTime.pm @@ -251,7 +251,7 @@ sub epochToHuman { $output =~ s/\~$key/\%$replacement/g; } #--- %M - $output = $dt->str$self->session->datetime->time($output); + $output = $dt->strftime($output); $temp = int($dt->month); $output =~ s/\%_varmonth_/$temp/g; #--- return @@ -280,9 +280,9 @@ sub epochToSet { my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone); my $withTime = shift; if ($withTime) { - return $dt->str$self->session->datetime->time("%Y-%m-%d %H:%M:%S"); + return $dt->strftime("%Y-%m-%d %H:%M:%S"); } - return $dt->str$self->session->datetime->time("%Y-%m-%d"); + return $dt->strftime("%Y-%m-%d"); } #------------------------------------------------------------------- @@ -707,10 +707,10 @@ sub setToEpoch { my $set = shift; return undef unless $set; my $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d %H:%M:%S' ); - my $dt = $parser->parse_dat$self->session->datetime->time($set); + my $dt = $parser->parse_datetime($set); unless ($dt) { $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' ); - $dt = $parser->parse_dat$self->session->datetime->time($set); + $dt = $parser->parse_datetime($set); } # in epochToSet we apply the user's time zone, so now we have to remove it. $dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone diff --git a/lib/WebGUI/Session/Form.pm b/lib/WebGUI/Session/Form.pm index eedbacd78..88171a646 100644 --- a/lib/WebGUI/Session/Form.pm +++ b/lib/WebGUI/Session/Form.pm @@ -131,7 +131,7 @@ sub process { =cut -sub session +sub session { my $self = shift; return $self->{_session}; } diff --git a/lib/WebGUI/Session/Http.pm b/lib/WebGUI/Session/Http.pm index 18b6f5a45..bd756aa26 100644 --- a/lib/WebGUI/Session/Http.pm +++ b/lib/WebGUI/Session/Http.pm @@ -87,7 +87,7 @@ sub getHeader { if ($self->session->setting->get("preventProxyCache")) { $params{"-expires"} = "-1d"; } - if ($session{http}{filename}) { + if ($self->{_http}{filename}) { $params{"-attachment"} = $self->{_http}{filename}; } } @@ -198,7 +198,7 @@ sub setCookie { my $value = shift; my $ttl = shift; $ttl = (defined $ttl ? $ttl : '+10y'); - if (exists $self->session->request) { + if ($self->session->request) { my $cookie = Apache2::Cookie->new($self->session->request, -name=>$name, -value=>$value, diff --git a/lib/WebGUI/Session/Icon.pm b/lib/WebGUI/Session/Icon.pm index b5a9995f2..acac8a523 100644 --- a/lib/WebGUI/Session/Icon.pm +++ b/lib/WebGUI/Session/Icon.pm @@ -68,7 +68,7 @@ sub _getBaseURL { if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") { $url .= $self->session->user->profileField("toolbar"); } else { - $url .= WebGUI::International::getLanguage($self->session->user->profileField("language"),"toolbar"); + $url .= WebGUI::International->new($self->session,'Icon')->getLanguage($self->session->user->profileField("language"),"toolbar"); } $url .= '/'; return $url; @@ -96,7 +96,7 @@ sub copy { my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; my $output = ''; - $output .= ''.WebGUI::International::get('Copy','Icon').''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Copy').''; return $output; } @@ -120,8 +120,8 @@ sub cut { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Cut','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Cut').''; return $output; } @@ -153,8 +153,8 @@ sub delete { if($confirmText) { $confirmText = qq| onclick="return confirm('$confirmText')" |; } - $output = ''; - $output .= ''.WebGUI::International::get('Delete','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Delete').''; return $output; } @@ -167,7 +167,7 @@ Generates an icon that can be used to drag content. =cut sub drag { - return ''.WebGUI::International::get('Drag','Icon').''; + return ''.WebGUI::International->new($self->session,'Icon')->get('Drag').''; } #------------------------------------------------------------------- @@ -190,8 +190,8 @@ sub edit { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Edit','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Edit').''; return $output; } @@ -215,8 +215,8 @@ sub export { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Export','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Export').''; return $output; } @@ -231,7 +231,7 @@ Returns a hash reference containing the list of toolbar icon sets to be selected sub getToolbarOptions { my %options; tie %options, 'Tie::IxHash'; - $options{useLanguageDefault} = WebGUI::International::get(1084); + $options{useLanguageDefault} = WebGUI::International->new($self->session,'Icon')->get(1084); my $dir = $self->session->config->get("extrasPath")."/toolbar"; opendir (DIR,$dir) or $self->session->errorHandler->warn("Can't open toolbar directory!"); my @files = readdir(DIR); @@ -265,8 +265,8 @@ sub help { my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; my ($output, $namespace); - $output = ''.WebGUI::International::get('Help','Icon').''; + my $output = ''.WebGUI::International->new($self->session,'Icon')->get('Help').''; return $output; } @@ -290,8 +290,8 @@ sub locked { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('locked','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('locked').''; return $output; } @@ -315,8 +315,8 @@ sub manage { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Manage','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Manage').''; return $output; } @@ -340,8 +340,8 @@ sub moveBottom { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move To Bottom','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move To Bottom').''; return $output; } @@ -365,8 +365,8 @@ sub moveDown { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move Down','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move Down').''; return $output; } @@ -390,8 +390,8 @@ sub moveLeft { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move Left','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move Left').''; return $output; } @@ -415,8 +415,8 @@ sub moveRight { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move Right','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move Right').''; return $output; } @@ -440,8 +440,8 @@ sub moveTop { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move To Top','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move To Top').''; return $output; } @@ -465,8 +465,8 @@ sub moveUp { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Move Up','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Move Up').''; return $output; } @@ -510,8 +510,8 @@ sub paste { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Paste','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Paste').''; return $output; } @@ -549,8 +549,8 @@ sub shortcut { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('Create Shortcut','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('Create Shortcut').''; return $output; } @@ -574,8 +574,8 @@ sub view { my $self = shift; my $urlParams = shift; my $pageURL = shift || $self->session->url->getRequestedUrl; - $output = ''; - $output .= ''.WebGUI::International::get('View','Icon').''; + my $output = ''; + $output .= ''.WebGUI::International->new($self->session,'Icon')->get('View').''; return $output; }