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

3
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -46,7 +46,6 @@ use Archive::Tar;
use Archive::Zip;
use Cwd ();
use Scope::Guard ();
use WebGUI::Utility qw/isIn/;
=head1 NAME
@ -133,7 +132,7 @@ sub fixFilenames {
my $files = $storage->getFiles('all');
FILE: foreach my $file (@{ $files }) {
my $extension = $storage->getFileExtension($file);
next FILE unless isIn($extension, qw/pl perl pm cgi php asp sh/);
next FILE unless $extension ~~ [qw/pl perl pm cgi php asp sh/];
my $newFile = $file;
#$newFile =~ s/\.$extension$/_$extension.txt/;
$newFile =~ s/\.$extension$/_$extension.txt/;

6
lib/WebGUI/Asset/RichEdit.pm
View file

@ -288,9 +288,9 @@ override getEditForm => sub {
my $evenOddToggle = 0;
foreach my $key (keys %buttons) {
$evenOddToggle = $evenOddToggle ? 0 : 1;
my $checked1 = isIn($key,@toolbarRow1);
my $checked2 = isIn($key,@toolbarRow2);
my $checked3 = isIn($key,@toolbarRow3);
my $checked1 = $key ~~ @toolbarRow1;
my $checked2 = $key ~~ @toolbarRow2;
my $checked3 = $key ~~ @toolbarRow3;
$buttonGrid .= '
<tr'.($evenOddToggle ? ' style="background-color: #eeeeee;"' : undef).'>
<td>'.$buttons{$key}.'</td>

12
lib/WebGUI/Asset/Sku/EMSBadge.pm
View file

@ -284,7 +284,11 @@ sub onRefund {
# get rid of any items in the cart related to this badge
foreach my $cartitem (@{$self->getCart->getItems()}) {
my $sku = $cartitem->getSku;
if (isIn((ref $sku), qw(WebGUI::Asset::Sku::EMSTicket WebGUI::Asset::Sku::EMSRibbon WebGUI::Asset::Sku::EMSToken))) {
if ((ref $sku) ~~ [qw(
WebGUI::Asset::Sku::EMSTicket
WebGUI::Asset::Sku::EMSRibbon
WebGUI::Asset::Sku::EMSToken
)]) {
if ($sku->getOptions->{badgeId} eq $badgeId) {
$cartitem->remove;
}
@ -309,7 +313,11 @@ sub onRemoveFromCart {
my $badgeId = $self->getOptions->{badgeId};
foreach my $cartitem (@{$item->cart->getItems()}) {
my $sku = $cartitem->getSku;
if (isIn((ref $sku), qw(WebGUI::Asset::Sku::EMSTicket WebGUI::Asset::Sku::EMSRibbon WebGUI::Asset::Sku::EMSToken))) {
if ((ref $sku) ~~ [qw(
WebGUI::Asset::Sku::EMSTicket
WebGUI::Asset::Sku::EMSRibbon
WebGUI::Asset::Sku::EMSToken
)]) {
if ($sku->getOptions->{badgeId} eq $badgeId) {
$cartitem->remove;
}

5
lib/WebGUI/Asset/Sku/EMSRibbon.pm
View file

@ -232,8 +232,9 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->isSystem;
return $self->session->privilege->vitalComponent() if (isIn($self->getId,
$self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
return $self->session->privilege->vitalComponent() if $self->getId ~~ [
$self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")
];
$self->trash;
return $self->getParent->www_buildBadge(undef,'ribbons');
}

7
lib/WebGUI/Asset/Sku/EMSTicket.pm
View file

@ -328,7 +328,7 @@ sub getPrice {
my $discount = 0;
my $badgeId = $self->getOptions->{badgeId};
my $ribbonId = $self->session->db->quickScalar("select ribbonAssetId from EMSRegistrantRibbon where badgeId=? limit 1",[$badgeId]);
if (defined $ribbonId && isIn($ribbonId, @ribbonIds)) {
if (defined $ribbonId && $ribbonId ~~ @ribbonIds) {
my $ribbon = WebGUI::Asset->newById($self->session, $ribbonId);
$discount = $ribbon->percentageDiscount;
}
@ -536,7 +536,10 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->isSystem;
return $self->session->privilege->vitalComponent() if (isIn($self->getId, $self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
return $self->session->privilege->vitalComponent() if $self->getId ~~ [
$self->session->setting->get("defaultPage"),
$self->session->setting->get("notFoundPage"),
];
$self->trash;
return $self->getParent->www_buildBadge(undef,'tickets');
}

6
lib/WebGUI/Asset/Sku/EMSToken.pm
View file

@ -226,8 +226,10 @@ sub www_delete {
my ($self) = @_;
return $self->session->privilege->insufficient() unless ($self->canEdit && $self->canEditIfLocked);
return $self->session->privilege->vitalComponent() if $self->isSystem;
return $self->session->privilege->vitalComponent() if (isIn($self->getId,
$self->session->setting->get("defaultPage"), $self->session->setting->get("notFoundPage")));
return $self->session->privilege->vitalComponent() if $self->getId ~~ [
$self->session->setting->get("defaultPage"),
$self->session->setting->get("notFoundPage"),
];
$self->trash;
return $self->getParent->www_buildBadge(undef,'tokens');
}

2
lib/WebGUI/Asset/Sku/Product.pm
View file

@ -1107,7 +1107,7 @@ sub www_deleteFileConfirm {
my $self = shift;
return $self->session->privilege->insufficient() unless ($self->canEdit);
my $column = $self->session->form->process("file");
return $self->www_edit unless (isIn($column, qw(image1 image2 image3 manual warranty brochure)));
return $self->www_edit unless $column ~~ [qw(image1 image2 image3 manual warranty brochure)];
my $store = $self->get($column);
my $file = WebGUI::Storage->get($self->session,$store);
$file->delete if defined $file;

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

@ -486,7 +486,7 @@ sub prepare {
my $id = $self->getId;
# don't send head block if we've already sent it for this template
return if isIn($id, @$sent);
return if $id ~~ $sent;
my $session = $self->session;
my ($db, $style) = $session->quick(qw(db style));
@ -587,7 +587,7 @@ override processEditForm => sub {
my $needsUpdate = 0;
if ($self->parser ne $self->session->form->process("parser","className") && ($self->session->form->process("parser","className") ne "")) {
$needsUpdate = 1;
if (isIn($self->session->form->process("parser","className"),@{$self->session->config->get("templateParsers")})) {
if ($self->session->form->process("parser","className") ~~ $self->session->config->get("templateParsers") ) {
%data = ( parser => $self->session->form->process("parser","className") );
} else {
%data = ( parser => $self->session->config->get("defaultTemplateParser") );

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

@ -1162,7 +1162,7 @@ sub getThreadsPaginator {
$sortBy =~ s/^\w+\.//;
# Sort by the thread rating instead of the post rating. other places don't care about threads.
$sortBy = $sortBy eq 'rating' ? 'threadRating' : $sortBy;
if (! WebGUI::Utility::isIn($sortBy, qw/userDefined1 userDefined2 userDefined3 userDefined4 userDefined5 title lineage revisionDate creationDate karmaRank threadRating views replies lastPostDate/)) {
if (! $sortBy ~~ [qw/userDefined1 userDefined2 userDefined3 userDefined4 userDefined5 title lineage revisionDate creationDate karmaRank threadRating views replies lastPostDate/]) {
$sortBy = 'revisionDate';
}
if ($sortBy eq 'assetId' || $sortBy eq 'revisionDate') {

4
lib/WebGUI/Asset/Wobject/Collaboration/Newsletter.pm
View file

@ -192,7 +192,7 @@ sub www_mySubscriptions {
my @userPrefs = $self->getUserSubscriptions;
foreach my $id (keys %{$meta}) {
my @options = ();
if (isIn($id, split("\n", $self->newsletterCategories))) {
if ($id ~~ [split("\n", $self->newsletterCategories))]) {
foreach my $option (split("\n", $meta->{$id}{possibleValues})) {
$option =~ s/\s+$//; # remove trailing spaces
next if $option eq ""; # skip blank values
@ -202,7 +202,7 @@ sub www_mySubscriptions {
optionForm => WebGUI::Form::checkbox($self->session, {
name => "subscriptions",
value => $preferenceName,
checked => isIn($preferenceName, @userPrefs),
checked => $preferenceName ~~ @userPrefs,
})
});
}

8
lib/WebGUI/Asset/Wobject/Dashboard.pm
View file

@ -270,7 +270,7 @@ override prepareView => sub {
next;
}
last unless $child;
unless (isIn($child->getId, @hidden) || !($child->canView)) {
unless ( $child->getId ~~ @hidden || !$child->canView) {
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
$child->prepareView;
}
@ -341,7 +341,7 @@ sub view {
push(@hidden,$child->shortcutToAssetId) if ref $child eq 'WebGUI::Asset::Shortcut';
#the following loop will initially place just-dashletted assets.
for (my $i = 0; $i < scalar(@positions); $i++) {
next unless isIn($child->shortcutToAssetId,@hidden);
next unless $child->shortcutToAssetId ~~ @hidden;
my $newChildId = $child->getId;
my $oldChildId = $child->shortcutToAssetId;
$positions[$i] =~ s/${oldChildId}/${newChildId}/g;
@ -362,7 +362,7 @@ sub view {
foreach my $asset (@assets) {
foreach my $child (@{$children}) {
if ($asset eq $child->getId) {
unless (isIn($asset,@hidden) || !($child->canView)) {
unless ($asset ~~ @hidden || !$child->canView) {
$self->session->style->setRawHeadTags($child->getExtraHeadTags);
$child->{_properties}{title} = $child->getTitle;
$child->{_properties}{title} = $child->getShortcut->getTitle if (ref $child eq 'WebGUI::Asset::Shortcut');
@ -400,7 +400,7 @@ sub view {
}
# deal with unplaced children
foreach my $child (@{$children}) {
unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) {
unless ($child->getId ~~ @found || $child->getId ~~ @hidden) {
if ($child->canView) {
$child->{_properties}{title} = $child->getShortcut->title if (ref $child eq 'WebGUI::Asset::Shortcut');
push(@{$vars{"position1_loop"}},{

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

@ -437,7 +437,7 @@ Returns true if the DataForm uses a captcha as one of the fields.
sub hasCaptcha {
my $self = shift;
return isIn('Captcha', map { $_->{type} } map { $self->getFieldConfig($_) } @{ $self->getFieldOrder });
return 'Captcha' ~~ [map { $_->{type} } map { $self->getFieldConfig($_) } @{ $self->getFieldOrder })];
}
#-------------------------------------------------------------------

6
lib/WebGUI/Asset/Wobject/EventManagementSystem.pm
View file

@ -398,7 +398,7 @@ sub getEventFieldsForImport {
foreach my $definition (@{WebGUI::Asset::Sku::EMSTicket->definition($self->session)}) {
$count++;
foreach my $field (keys %{$definition->{properties}}) {
next if ($count > 1 && !isIn($field, qw(title description)));
next if ($count > 1 && ! $field ~~ [qw(title description)]);
next unless ($definition->{properties}{$field}{label} ne "");
push(@fields, {
name => $field,
@ -1855,7 +1855,7 @@ className='WebGUI::Asset::Sku::EMSTicket' and state='published' and revisionDate
foreach my $id (@ids) {
# skip tickets we already have
if (isIn($id, @existingTickets)) {
if ($id ~~ @existingTickets) {
$totalTickets--;
next;
}
@ -2125,7 +2125,7 @@ $|=1;
my $metadata = $event->getEventMetaData;
my $i = 0;
foreach my $field (@{$fields}) {
next unless isIn($field->{name}, @import);
next unless $field->{name} ~~ @import;
$out->print("\tAdding field ".$field->{label}."\n",1);
my $type = $field->{type};
##Force the use of Form::DateTime and MySQL Format

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

@ -1185,7 +1185,7 @@ sub www_getCompareFormData {
}
else {
foreach my $result (@{$self->getListings}) {
if(WebGUI::Utility::isIn($result->{assetId},@listingIds)){
if($result->{assetId} ~~ @listingIds){
$result->{checked} = 'checked';
}
push @results, $result;

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

@ -422,7 +422,7 @@ sub view {
my %rules;
$rules{endingLineageLength} = $start->getLineageLength+$self->descendantEndPoint;
$rules{assetToPedigree} = $current if (isIn("pedigree",@includedRelationships));
$rules{assetToPedigree} = $current if ("pedigree" ~~ @includedRelationships);
$rules{ancestorLimit} = $self->ancestorEndPoint;
$rules{orderByClause} = 'rpad(asset.lineage, 255, 9) desc' if ($self->reversePageLoop);
my $assetIter = $start->getLineageIterator(\@includedRelationships,\%rules);

6
lib/WebGUI/Asset/Wobject/Thingy.pm
View file

@ -975,7 +975,7 @@ sub getFormPlugin {
}
}
if ( WebGUI::Utility::isIn( $data->{fieldType}, qw(SelectList CheckList SelectBox Attachments) ) ) {
if ( $data->{fieldType} ~~ [qw(SelectList CheckList SelectBox Attachments) ] ) {
my @values;
if ( $useFormPostData && $session->form->param($name) ) {
$param{ value } = [ $session->form->process( $name, $data->{fieldType} ) ];
@ -1285,7 +1285,7 @@ sub importAssetCollateralData {
# delete deleted things
my $thingsInDatabase = $self->getThings;
while (my $thingInDataBase = $thingsInDatabase->hashRef) {
if (!WebGUI::Utility::isIn($thingInDataBase->{thingId},@importThings)){
if (!$thingInDataBase->{thingId} ~~ @importThings){
# delete thing
$self->deleteThing($thingInDataBase->{thingId});
}
@ -1312,7 +1312,7 @@ sub importAssetCollateralData {
my $fieldsInDatabase = $session->db->read('select fieldId, thingId from Thingy_fields where assetId = ?',
[$self->getId]);
while (my $fieldInDataBase = $fieldsInDatabase->hashRef) {
if (!WebGUI::Utility::isIn($fieldInDataBase->{fieldId},@importFields)){
if (!$fieldInDataBase->{fieldId} ~~ @importFields){
# delete field
$self->deleteField($fieldInDataBase->{fieldId},$fieldInDataBase->{thingId},"1");
}

8
lib/WebGUI/Asset/Wobject/UserList.pm
View file

@ -227,7 +227,7 @@ sub getFormElement {
$param{value} = ($data->{defaultValue} =~ /checked/xi) ? 1 : "";
}
if (WebGUI::Utility::isIn($data->{fieldType},qw(SelectList CheckList SelectBox Attachments SelectSlider))) {
if ($data->{fieldType} ~~ [qw(SelectList CheckList SelectBox Attachments SelectSlider)]) {
my @defaultValues;
if ($self->session->form->param($name)) {
@defaultValues = $self->session->form->selectList($name);
@ -358,7 +358,7 @@ sub view {
my $currentUrlWithoutSort = $self->getUrl();
foreach ($form->param) {
unless (WebGUI::Utility::isIn($_,qw(sortBy sortOrder op func)) || $_ =~ /identifier/i || $_ =~ /password/i) {
unless ( $_ ~~ [qw(sortBy sortOrder op func), qr/identifier/i, qr/password/i]) {
$currentUrlWithoutSort = $url->append($currentUrlWithoutSort, $url->escape($_)
.'='.$url->escape($form->process($_)));
}
@ -502,7 +502,7 @@ sub view {
}
my @sortByUserProperties = ('dateCreated', 'lastUpdated', 'karma', 'userId');
if(isIn($sortBy,@sortByUserProperties)){
if( $sortBy ~~ @sortByUserProperties ){
$sortBy = 'users.'.$sortBy;
}
$sortBy = join '.', map { $dbh->quote_identifier($_) } split /\./, $sortBy;
@ -550,7 +550,7 @@ sub view {
# Handle special case of alias, which does not have a default value but is set to the username by default
$value = $user->{userName} if ($profileFieldName eq 'alias' && $value eq '');
my %profileFieldValues;
if (WebGUI::Utility::isIn(ucfirst $profileField->{fieldType},qw(File Image)) && $value ne ''){
if ((ucfirst $profileField->{fieldType}) ~~ [qw(File Image)]) && $value ne ''){
my $file = WebGUI::Form::DynamicField->new($self->session,
fieldType=>$profileField->{fieldType},
value=>$value

5
lib/WebGUI/Asset/Wobject/WikiMaster.pm
View file

@ -195,7 +195,7 @@ with 'WebGUI::Role::Asset::RssFeed';
use WebGUI::International;
use HTML::Parser;
use URI::Escape;
use WebGUI::Utility qw/isIn/;
use WebGUI::Utility qw//;
use WebGUI::Form;
use Clone qw/clone/;
@ -390,8 +390,7 @@ sub autolinkHtml {
my %mapping = $self->session->db->buildHash("SELECT LOWER(d.title), d.url FROM asset AS i INNER JOIN assetData AS d ON i.assetId = d.assetId WHERE i.parentId = ? and className='WebGUI::Asset::WikiPage' and i.state='published' and d.status='approved' order by d.revisionDate ASC", [$self->getId]);
TITLE: foreach my $title (keys %mapping) {
my $url = delete $mapping{$title};
##isIn short circuits and is faster than grep and/or first
next TITLE if isIn($title, @skipTitles);
next TITLE if $title ~~ @skipTitles;
$mapping{$title} = $self->session->url->gateway($url);
}