replaced return; with return undef;
This commit is contained in:
parent
ffa90c5fbd
commit
fa09c41598
113 changed files with 287 additions and 286 deletions
|
|
@ -422,7 +422,7 @@ An integer ranging from 1-7 representing the day of the week (Sunday is 1 and Sa
|
|||
sub getDayName {
|
||||
my $self = shift;
|
||||
my $day = shift;
|
||||
return unless ($day >= 1 && $day <= 7);
|
||||
return undef unless ($day >= 1 && $day <= 7);
|
||||
|
||||
my $i18n = WebGUI::International->new($self->session,'DateTime');
|
||||
return $i18n->get((qw/monday tuesday wednesday thursday friday saturday sunday/)[$day-1]);
|
||||
|
|
@ -552,7 +552,7 @@ An integer ranging from 1-12 representing the month.
|
|||
sub getMonthName {
|
||||
my $self = shift;
|
||||
my $month = shift;
|
||||
return unless ($month >= 1 && $month <= 12);
|
||||
return undef unless ($month >= 1 && $month <= 12);
|
||||
|
||||
my $i18n = WebGUI::International->new($self->session,'DateTime');
|
||||
return $i18n->get((qw/january february march april may june
|
||||
|
|
@ -734,7 +734,7 @@ sub mailToEpoch {
|
|||
my $dt = eval {$parser->parse_datetime($date)};
|
||||
if ($@) {
|
||||
$self->session->errorHandler->warn($date." is not a valid date for email, and is so poorly formatted, we can't even guess what it is.");
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
return $dt->epoch;
|
||||
}
|
||||
|
|
@ -909,7 +909,7 @@ A string in the format of YYYY-MM-DD or YYYY-MM-DD HH:MM:SS.
|
|||
sub setToEpoch {
|
||||
my $self = shift;
|
||||
my $set = shift;
|
||||
return unless $set;
|
||||
return undef unless $set;
|
||||
my $time_zone = $self->getTimeZone();
|
||||
my $parser = DateTime::Format::Strptime->new(pattern=>'%Y-%m-%d %H:%M:%S', time_zone=>$time_zone);
|
||||
my $dt = $parser->parse_datetime($set);
|
||||
|
|
|
|||
|
|
@ -110,7 +110,7 @@ sub param {
|
|||
@data = $self->session->request->param($field);
|
||||
return wantarray ? @data : $data[0];
|
||||
} else {
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
} else {
|
||||
if ($self->session->request) {
|
||||
|
|
@ -123,7 +123,7 @@ sub param {
|
|||
}
|
||||
return keys %params;
|
||||
} else {
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -264,11 +264,11 @@ Generates and sends HTTP headers for a response.
|
|||
|
||||
sub sendHeader {
|
||||
my $self = shift;
|
||||
return if ($self->{_http}{noHeader});
|
||||
return undef if ($self->{_http}{noHeader});
|
||||
return $self->_sendMinimalHeader unless defined $self->session->db(1);
|
||||
|
||||
my ($request, $datetime, $config, $var) = $self->session->quick(qw(request datetime config var));
|
||||
return unless $request;
|
||||
return undef unless $request;
|
||||
my $userId = $var->get("userId");
|
||||
|
||||
# send webgui session cookie
|
||||
|
|
@ -305,7 +305,7 @@ sub sendHeader {
|
|||
$request->status($self->getStatus());
|
||||
$request->status_line($self->getStatus().' '.$self->getStatusDescription());
|
||||
}
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub _sendMinimalHeader {
|
||||
|
|
@ -316,7 +316,7 @@ sub _sendMinimalHeader {
|
|||
$request->no_cache(1);
|
||||
$request->status($self->getStatus());
|
||||
$request->status_line($self->getStatus().' '.$self->getStatusDescription());
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -508,7 +508,7 @@ sub setRedirect {
|
|||
my $self = shift;
|
||||
my $url = shift;
|
||||
my @params = $self->session->form->param;
|
||||
return if ($url eq $self->session->url->page() && scalar(@params) < 1); # prevent redirecting to self
|
||||
return undef if ($url eq $self->session->url->page() && scalar(@params) < 1); # prevent redirecting to self
|
||||
$self->session->errorHandler->info("Redirecting to $url");
|
||||
$self->{_http}{location} = $url;
|
||||
$self->setStatus("302", "Redirect");
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@ The name of the scratch variable.
|
|||
sub delete {
|
||||
my $self = shift;
|
||||
my $name = shift;
|
||||
return unless ($name);
|
||||
return undef unless ($name);
|
||||
my $value = delete $self->{_data}{$name};
|
||||
$self->session->db->write("delete from userSessionScratch where name=? and sessionId=?", [$name, $self->session->getId]);
|
||||
return $value;
|
||||
|
|
@ -97,7 +97,7 @@ The name of the scratch variable.
|
|||
sub deleteName {
|
||||
my $self = shift;
|
||||
my $name = shift;
|
||||
return unless ($name);
|
||||
return undef unless ($name);
|
||||
delete $self->{_data}{$name};
|
||||
$self->session->db->write("delete from userSessionScratch where name=?", [$name]);
|
||||
}
|
||||
|
|
@ -122,7 +122,7 @@ sub deleteNameByValue {
|
|||
my $self = shift;
|
||||
my $name = shift;
|
||||
my $value = shift;
|
||||
return unless ($name and defined $value);
|
||||
return undef unless ($name and defined $value);
|
||||
delete $self->{_data}{$name} if ($self->{_data}{$name} eq $value);
|
||||
$self->session->db->write("delete from userSessionScratch where name=? and value=?", [$name,$value]);
|
||||
}
|
||||
|
|
@ -215,7 +215,7 @@ sub set {
|
|||
my $self = shift;
|
||||
my $name = shift;
|
||||
my $value = shift;
|
||||
return unless ($name);
|
||||
return undef unless ($name);
|
||||
$self->{_data}{$name} = $value;
|
||||
$self->session->db->write("insert into userSessionScratch (sessionId, name, value) values (?,?,?) on duplicate key update value=VALUES(value)", [$self->session->getId, $name, $value]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ The name of the stow variable.
|
|||
sub delete {
|
||||
my $self = shift;
|
||||
my $name = shift;
|
||||
return unless ($name);
|
||||
return undef unless ($name);
|
||||
delete $self->{_data}{$name};
|
||||
}
|
||||
|
||||
|
|
@ -108,7 +108,7 @@ The name of the variable.
|
|||
sub get {
|
||||
my $self = shift;
|
||||
my $var = shift;
|
||||
return if $self->session->config->get("disableCache");
|
||||
return undef if $self->session->config->get("disableCache");
|
||||
return $self->{_data}{$var};
|
||||
}
|
||||
|
||||
|
|
@ -167,7 +167,7 @@ sub set {
|
|||
if $self->session->config->get("disableCache");
|
||||
my $name = shift;
|
||||
my $value = shift;
|
||||
return unless ($name);
|
||||
return undef unless ($name);
|
||||
$self->{_data}{$name} = $value;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -280,7 +280,7 @@ sub setLink {
|
|||
my $url = shift;
|
||||
my $params = shift;
|
||||
$params = {} unless (defined $params and ref $params eq 'HASH');
|
||||
return if ($self->{_link}{$url});
|
||||
return undef if ($self->{_link}{$url});
|
||||
my $tag = '<link href="'.$url.'"';
|
||||
foreach my $name (keys %{$params}) {
|
||||
$tag .= ' '.$name.'="'.$params->{$name}.'"';
|
||||
|
|
@ -390,7 +390,7 @@ sub setScript {
|
|||
my $self = shift;
|
||||
my $url = shift;
|
||||
my $params = shift;
|
||||
return if ($self->{_javascript}{$url});
|
||||
return undef if ($self->{_javascript}{$url});
|
||||
my $tag = '<script src="'.$url.'"';
|
||||
foreach my $name (keys %{$params}) {
|
||||
$tag .= ' '.$name.'="'.$params->{$name}.'"';
|
||||
|
|
@ -438,7 +438,7 @@ sub userStyle {
|
|||
if (defined $output) {
|
||||
return $self->process($output,$self->session->setting->get("userFunctionStyleId"));
|
||||
} else {
|
||||
return;
|
||||
return undef;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -230,12 +230,12 @@ Returns the URL of the page this request was refered from (no gateway, no query
|
|||
sub getRefererUrl {
|
||||
my $self = shift;
|
||||
my $referer = $self->session->env->get("HTTP_REFERER");
|
||||
return unless ($referer);
|
||||
return undef unless ($referer);
|
||||
my $url = $referer;
|
||||
my $gateway = $self->session->config->get("gateway");
|
||||
$url =~ s{https?://[A-Za-z0-9\.-]+$gateway/*([^?]*)\??.*$}{$1};
|
||||
if ($url eq $referer) { ##s/// failed
|
||||
return;
|
||||
return undef;
|
||||
} else {
|
||||
return $url;
|
||||
}
|
||||
|
|
@ -252,7 +252,7 @@ Returns the URL of the page requested (no gateway, no query params, just the pag
|
|||
|
||||
sub getRequestedUrl {
|
||||
my $self = shift;
|
||||
return unless ($self->session->request);
|
||||
return undef unless ($self->session->request);
|
||||
unless ($self->{_requestedUrl}) {
|
||||
$self->{_requestedUrl} = $self->session->request->uri;
|
||||
my $gateway = $self->session->config->get("gateway");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue