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

remove WebGUI::Utility::isIn

Browse source
This commit is contained in:
Graham Knop 2010-09-07 12:33:15 -05:00
parent 0e754a51e4
commit 6aa26c2e44
61 changed files with 126 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,7 +22,7 @@ use DateTime::TimeZone;
use Scalar::Util qw( weaken );
use Tie::IxHash;
use WebGUI::International;
use WebGUI::Utility qw(isIn);
use WebGUI::Utility qw();
use Scalar::Util qw(weaken);
@ -609,7 +609,7 @@ sub getTimeZone {
my $zone = $self->session->user->profileField('timeZone');
$zone =~ s/ /\_/g;
if ($zone) {
if (isIn($zone, @zones)) {
if ( $zone ~~ @zones ) {
$self->session->user->{_timeZone} = $zone;
return $zone;
}

2
lib/WebGUI/Session/Http.pm
View file

@ -17,7 +17,7 @@ package WebGUI::Session::Http;
use strict;
use Scalar::Util qw(weaken);
use WebGUI::Utility qw(isIn);
use WebGUI::Utility qw();
use HTTP::Date ();
sub _deprecated {

2
lib/WebGUI/Session/Url.pm
View file

@ -349,7 +349,7 @@ sub getSiteURL {
my $site = "";
my $sitenames = $self->session->config->get("sitename");
my ($http_host,$currentPort) = split(':', $self->session->request->env->{"HTTP_HOST"});
if ($self->session->setting->get("hostToUse") eq "HTTP_HOST" and isIn($http_host,@{$sitenames})) {
if ($self->session->setting->get("hostToUse") eq "HTTP_HOST" and $http_host ~~ $sitenames) {
$site = $http_host;
} else {
$site = $sitenames->[0];