more bug fixes

This commit is contained in:
JT Smith 2006-01-13 21:47:38 +00:00
parent 6779353b85
commit ee5ccfad26
5 changed files with 49 additions and 49 deletions

View file

@ -169,7 +169,7 @@ sub dbSlave {
} }
} }
} }
if ($session->var("adminOn") || !exists $self->{_slave}) { if ($self->var("adminOn") || !exists $self->{_slave}) {
return $self->db; return $self->db;
} else { } else {
return $self->{_slave}->[rand @{$self->{_slave}}]; return $self->{_slave}->[rand @{$self->{_slave}}];
@ -374,7 +374,7 @@ Returns a WebGUI::Session::Privilege object.
sub privilege { sub privilege {
my $self = shift; my $self = shift;
unless (exists $self->{_privilege}) { unless (exists $self->{_privilege}) {
$self->{_privilege} = WebGUI::Session::Privilege->new($session); $self->{_privilege} = WebGUI::Session::Privilege->new($self);
} }
return $self->{_privilege}; 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)); $self->db->write("update passiveProfileLog set userId = ".$self->db->quote($self->{_var}{userId})." where sessionId = ".$self->db->quote($self->getId));
} }
delete $self->{_stow}; 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}) { } 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}); $self->{_request}->user($self->{_user}->username) if ($self->{_request});
return $self->{_user}; return $self->{_user};
@ -537,7 +537,7 @@ Returns a reference to the WebGUI::Session::Var object.
sub var { sub var {
my $self = shift; my $self = shift;
unless ($self->{_var}) { unless ($self->{_var}) {
$self->{_var} = WebGUI::Session::Var->new($session); $self->{_var} = WebGUI::Session::Var->new($self);
} }
return $self->{_var}; return $self->{_var};
} }

View file

@ -251,7 +251,7 @@ sub epochToHuman {
$output =~ s/\~$key/\%$replacement/g; $output =~ s/\~$key/\%$replacement/g;
} }
#--- %M #--- %M
$output = $dt->str$self->session->datetime->time($output); $output = $dt->strftime($output);
$temp = int($dt->month); $temp = int($dt->month);
$output =~ s/\%_varmonth_/$temp/g; $output =~ s/\%_varmonth_/$temp/g;
#--- return #--- return
@ -280,9 +280,9 @@ sub epochToSet {
my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone); my $dt = DateTime->from_epoch( epoch =>shift, time_zone=>$timeZone);
my $withTime = shift; my $withTime = shift;
if ($withTime) { 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; my $set = shift;
return undef unless $set; return undef unless $set;
my $parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d %H:%M:%S' ); 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) { unless ($dt) {
$parser = DateTime::Format::Strptime->new( pattern => '%Y-%m-%d' ); $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. # 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 $dt->set_time_zone($self->session->user->profileField("timeZone")|| "America/Chicago"); # assign the user's timezone

View file

@ -131,7 +131,7 @@ sub process {
=cut =cut
sub session sub session {
my $self = shift; my $self = shift;
return $self->{_session}; return $self->{_session};
} }

View file

@ -87,7 +87,7 @@ sub getHeader {
if ($self->session->setting->get("preventProxyCache")) { if ($self->session->setting->get("preventProxyCache")) {
$params{"-expires"} = "-1d"; $params{"-expires"} = "-1d";
} }
if ($session{http}{filename}) { if ($self->{_http}{filename}) {
$params{"-attachment"} = $self->{_http}{filename}; $params{"-attachment"} = $self->{_http}{filename};
} }
} }
@ -198,7 +198,7 @@ sub setCookie {
my $value = shift; my $value = shift;
my $ttl = shift; my $ttl = shift;
$ttl = (defined $ttl ? $ttl : '+10y'); $ttl = (defined $ttl ? $ttl : '+10y');
if (exists $self->session->request) { if ($self->session->request) {
my $cookie = Apache2::Cookie->new($self->session->request, my $cookie = Apache2::Cookie->new($self->session->request,
-name=>$name, -name=>$name,
-value=>$value, -value=>$value,

View file

@ -68,7 +68,7 @@ sub _getBaseURL {
if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") { if ($self->session->user->profileField("toolbar") ne "useLanguageDefault") {
$url .= $self->session->user->profileField("toolbar"); $url .= $self->session->user->profileField("toolbar");
} else { } 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 .= '/'; $url .= '/';
return $url; return $url;
@ -96,7 +96,7 @@ sub copy {
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'copy.gif" align="middle" border="0" alt="'.WebGUI::International::get('Copy','Icon').'" title="'.WebGUI::International::get('Copy','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'copy.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Copy').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Copy').'" /></a>';
return $output; return $output;
} }
@ -120,8 +120,8 @@ sub cut {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'cut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Cut','Icon').'" title="'.WebGUI::International::get('Cut','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'cut.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Cut').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Cut').'" /></a>';
return $output; return $output;
} }
@ -153,8 +153,8 @@ sub delete {
if($confirmText) { if($confirmText) {
$confirmText = qq| onclick="return confirm('$confirmText')" |; $confirmText = qq| onclick="return confirm('$confirmText')" |;
} }
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'" '.$confirmText.'>'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'" '.$confirmText.'>';
$output .= '<img src="'.$self->_getBaseURL().'delete.gif" align="middle" border="0" alt="'.WebGUI::International::get('Delete','Icon').'" title="'.WebGUI::International::get('Delete','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'delete.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Delete').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Delete').'" /></a>';
return $output; return $output;
} }
@ -167,7 +167,7 @@ Generates an icon that can be used to drag content.
=cut =cut
sub drag { sub drag {
return '<img id="dragTrigger" class="dragTrigger" src="'.$self->_getBaseURL().'drag.gif" align="middle" border="0" alt="'.WebGUI::International::get('Drag','Icon').'" title="'.WebGUI::International::get('Drag','Icon').'" />'; return '<img id="dragTrigger" class="dragTrigger" src="'.$self->_getBaseURL().'drag.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Drag').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Drag').'" />';
} }
#------------------------------------------------------------------- #-------------------------------------------------------------------
@ -190,8 +190,8 @@ sub edit {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'edit.gif" align="middle" border="0" alt="'.WebGUI::International::get('Edit','Icon').'" title="'.WebGUI::International::get('Edit','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'edit.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Edit').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Edit').'" /></a>';
return $output; return $output;
} }
@ -215,8 +215,8 @@ sub export {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'export.gif" align="middle" border="0" alt="'.WebGUI::International::get('Export','Icon').'" title="'.WebGUI::International::get('Export','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'export.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Export').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Export').'" /></a>';
return $output; return $output;
} }
@ -231,7 +231,7 @@ Returns a hash reference containing the list of toolbar icon sets to be selected
sub getToolbarOptions { sub getToolbarOptions {
my %options; my %options;
tie %options, 'Tie::IxHash'; 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"; my $dir = $self->session->config->get("extrasPath")."/toolbar";
opendir (DIR,$dir) or $self->session->errorHandler->warn("Can't open toolbar directory!"); opendir (DIR,$dir) or $self->session->errorHandler->warn("Can't open toolbar directory!");
my @files = readdir(DIR); my @files = readdir(DIR);
@ -265,8 +265,8 @@ sub help {
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
my ($output, $namespace); my ($output, $namespace);
$output = '<a href="'.$self->session->url->page('op=viewHelp;hid='.$urlParams.';namespace='.$namespace). my $output = '<a href="'.$self->session->url->page('op=viewHelp;hid='.$urlParams.';namespace='.$namespace).
'" target="_blank"><img src="'.$self->_getBaseURL().'help.gif" border="0" align="right" title="'.WebGUI::International::get('Help','Icon').'" Alt="'.WebGUI::International::get('Help','Icon').'"></a>'; '" target="_blank"><img src="'.$self->_getBaseURL().'help.gif" border="0" align="right" title="'.WebGUI::International->new($self->session,'Icon')->get('Help').'" Alt="'.WebGUI::International->new($self->session,'Icon')->get('Help').'"></a>';
return $output; return $output;
} }
@ -290,8 +290,8 @@ sub locked {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'locked.gif" align="middle" border="0" alt="'.WebGUI::International::get('locked','Icon').'" title="'.WebGUI::International::get('locked','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'locked.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('locked').'" title="'.WebGUI::International->new($self->session,'Icon')->get('locked').'" /></a>';
return $output; return $output;
} }
@ -315,8 +315,8 @@ sub manage {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'manage.gif" align="middle" border="0" alt="'.WebGUI::International::get('Manage','Icon').'" title="'.WebGUI::International::get('Manage','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'manage.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Manage').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Manage').'" /></a>';
return $output; return $output;
} }
@ -340,8 +340,8 @@ sub moveBottom {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveBottom.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Bottom','Icon').'" title="'.WebGUI::International::get('Move To Bottom','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveBottom.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move To Bottom').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move To Bottom').'" /></a>';
return $output; return $output;
} }
@ -365,8 +365,8 @@ sub moveDown {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveDown.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Down','Icon').'" title="'.WebGUI::International::get('Move Down','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveDown.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move Down').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move Down').'" /></a>';
return $output; return $output;
} }
@ -390,8 +390,8 @@ sub moveLeft {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveLeft.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Left','Icon').'" title="'.WebGUI::International::get('Move Left','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveLeft.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move Left').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move Left').'" /></a>';
return $output; return $output;
} }
@ -415,8 +415,8 @@ sub moveRight {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveRight.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Right','Icon').'" title="'.WebGUI::International::get('Move Right','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveRight.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move Right').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move Right').'" /></a>';
return $output; return $output;
} }
@ -440,8 +440,8 @@ sub moveTop {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveTop.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move To Top','Icon').'" title="'.WebGUI::International::get('Move To Top','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveTop.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move To Top').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move To Top').'" /></a>';
return $output; return $output;
} }
@ -465,8 +465,8 @@ sub moveUp {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'moveUp.gif" align="middle" border="0" alt="'.WebGUI::International::get('Move Up','Icon').'" title="'.WebGUI::International::get('Move Up','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'moveUp.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Move Up').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Move Up').'" /></a>';
return $output; return $output;
} }
@ -510,8 +510,8 @@ sub paste {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'paste.gif" align="middle" border="0" alt="'.WebGUI::International::get('Paste','Icon').'" title="'.WebGUI::International::get('Paste','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'paste.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Paste').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Paste').'" /></a>';
return $output; return $output;
} }
@ -549,8 +549,8 @@ sub shortcut {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'shortcut.gif" align="middle" border="0" alt="'.WebGUI::International::get('Create Shortcut','Icon').'" title="'.WebGUI::International::get('Create Shortcut','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'shortcut.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('Create Shortcut').'" title="'.WebGUI::International->new($self->session,'Icon')->get('Create Shortcut').'" /></a>';
return $output; return $output;
} }
@ -574,8 +574,8 @@ sub view {
my $self = shift; my $self = shift;
my $urlParams = shift; my $urlParams = shift;
my $pageURL = shift || $self->session->url->getRequestedUrl; my $pageURL = shift || $self->session->url->getRequestedUrl;
$output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">'; my $output = '<a href="'.$self->session->url->gateway($pageURL,$urlParams).'">';
$output .= '<img src="'.$self->_getBaseURL().'view.gif" align="middle" border="0" alt="'.WebGUI::International::get('View','Icon').'" title="'.WebGUI::International::get('View','Icon').'" /></a>'; $output .= '<img src="'.$self->_getBaseURL().'view.gif" align="middle" border="0" alt="'.WebGUI::International->new($self->session,'Icon')->get('View').'" title="'.WebGUI::International->new($self->session,'Icon')->get('View').'" /></a>';
return $output; return $output;
} }