From 08fbd46d28947a2632fd4a1a6235de370d3a5553 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Wed, 5 Dec 2007 16:46:38 +0000 Subject: [PATCH] all loop iterators have to be declared lexical. PBP/108 --- lib/WebGUI/Asset/Wobject/SQLForm.pm | 20 +++++++++----------- lib/WebGUI/Image/Graph/Pie.pm | 8 ++++---- lib/WebGUI/Image/Graph/XYGraph/Bar.pm | 4 ++-- lib/WebGUI/Operation/Commerce.pm | 14 +++++++------- lib/WebGUI/Operation/Graphics.pm | 4 ++-- lib/WebGUI/Operation/ProductManager.pm | 6 +++--- lib/WebGUI/Operation/Profile.pm | 4 ++-- lib/WebGUI/PerformanceProfiler.pm | 5 ++--- 8 files changed, 31 insertions(+), 34 deletions(-) diff --git a/lib/WebGUI/Asset/Wobject/SQLForm.pm b/lib/WebGUI/Asset/Wobject/SQLForm.pm index c9ad12cf1..ccc0dd13b 100644 --- a/lib/WebGUI/Asset/Wobject/SQLForm.pm +++ b/lib/WebGUI/Asset/Wobject/SQLForm.pm @@ -772,13 +772,13 @@ resides. =cut sub _getDatabaseInfo { - my (@tables, $tableName, $sth, $columnDefinition, $currentColumn, $databaseDefinition); + my (@tables, $sth, $columnDefinition, $currentColumn, $databaseDefinition); my $self = shift; my $dbLink = $self->_getDbLink; @tables = $dbLink->db->buildArray("show tables"); - foreach $tableName (@tables) { + foreach my $tableName (@tables) { $sth = $dbLink->db->read("describe ".$tableName); while ($columnDefinition = $sth->hashRef) { @@ -1940,7 +1940,7 @@ Processes and stores the field properties, and will alter the table according to =cut sub www_editFieldSave { - my ($databaseDef, $key, $joinNumber, @tables, $processed, $tableName, + my ($databaseDef, $joinNumber, @tables, $processed, $tableName, $joinAColumnName, $joinATableName, $joinBColumnName, $joinBTableName, @joinConstraints, @differenceConstraints, $maxAllowedLength, $fieldId, @error, $properties, $i18n); @@ -2028,7 +2028,7 @@ my @columnConstraints; my %fingerprint; my $dbLink = $self->_getDbLink; - foreach $key (sort(keys(%{$self->session->form->paramsHashRef}))) { + foreach my $key (sort(keys(%{$self->session->form->paramsHashRef}))) { if ($key =~ m/^database(\d+)/ && $self->session->form->process($key)) { $joinNumber = $1; my $databaseName = $self->session->form->process("database$joinNumber"); @@ -3332,7 +3332,6 @@ revision number in form param 'rev'; otherwise the latest revision is used. =cut sub www_viewFile { - my ($field, $revision); my $self = shift; return $self->session->privilege->insufficient() unless ($self->canView); @@ -3341,7 +3340,7 @@ sub www_viewFile { my $recordId = $self->session->form->process('rid'); my $revision = $self->session->form->process('rev'); - $field = $self->_getFieldProperties($fieldId); + my $field = $self->_getFieldProperties($fieldId); if ($field->{formFieldType} eq 'file') { my ($mimeType, $data) = $self->_getFileFromDatabase($recordId, $field->{fieldName}, $revision); @@ -3364,7 +3363,6 @@ This particular caching scheme is used in stead of storage, since privileges sho =cut sub www_viewThumbnail { - my ($field, $revision, $thumbnailData); my $self = shift; return $self->session->privilege->insufficient() unless ($self->canView); @@ -3372,12 +3370,12 @@ sub www_viewThumbnail { my $fieldId = $self->session->form->process('fid'); my $recordId = $self->session->form->process('rid'); my $revision = $self->session->form->process('rev'); - $field = $self->_getFieldProperties($self->session->form->process("fid")); + my $field = $self->_getFieldProperties($self->session->form->process("fid")); if ($field->{formFieldType} eq 'file') { my $cache = WebGUI::Cache->new($self->session, ["sqlform",$recordId,$fieldId,$revision], 24*60*60); - $thumbnailData = $cache->get; + my $thumbnailData = $cache->get; unless ($thumbnailData) { my ($mimeType, $data) = $self->_getFileFromDatabase($recordId, $field->{fieldName}, $revision); @@ -3923,7 +3921,7 @@ my %sortWeights = ( ); sub _constructSearchQuery { - my (@tables, @joinConstraints, $tableCounter, @constraints, $currentField, $conditional, @joinSequence); + my (@tables, @joinConstraints, $tableCounter, @constraints, $conditional, @joinSequence); my $self = shift; my $searchInFields = shift; my $showFields = shift; @@ -3946,7 +3944,7 @@ sub _constructSearchQuery { $tableCounter = 2; # Process search fields. - foreach $currentField (@$searchInFields) { + foreach my $currentField (@$searchInFields) { # Set conditional given for this field or to like or regexp mode if in normal search my $searchMode = $self->session->form->process("searchMode") || $self->session->scratch->get('SQLForm_'.$self->getId.'searchMode'); if ($searchMode) { diff --git a/lib/WebGUI/Image/Graph/Pie.pm b/lib/WebGUI/Image/Graph/Pie.pm index 4c9a45bbd..62869cd88 100644 --- a/lib/WebGUI/Image/Graph/Pie.pm +++ b/lib/WebGUI/Image/Graph/Pie.pm @@ -398,7 +398,7 @@ Draws the pie chart. =cut sub draw { - my ($currentSlice, $coordinates, $sliceData, $leftPlaneVisible, $rightPlaneVisible); + my ($currentSlice, $coordinates, $leftPlaneVisible, $rightPlaneVisible); my $self = shift; $self->processDataset; @@ -407,7 +407,7 @@ sub draw { my @slices = sort sortSlices @{$self->{_slices}}; # First draw the bottom planes and the labels behind the chart. - foreach $sliceData (@slices) { + foreach my $sliceData (@slices) { # Draw bottom $self->drawBottom($sliceData); @@ -419,7 +419,7 @@ sub draw { # Second draw the sides # If angle == 0 do a 2d pie if ($self->getTiltAngle != 0) { - foreach $sliceData (@slices) { #(sort sortSlices @{$self->{_slices}}) { + foreach my $sliceData (@slices) { #(sort sortSlices @{$self->{_slices}}) { $leftPlaneVisible = (_mod2pi($sliceData->{startAngle}) <= 0.5*pi || _mod2pi($sliceData->{startAngle} >= 1.5*pi)); $rightPlaneVisible = (_mod2pi($sliceData->{stopAngle}) >= 0.5*pi && _mod2pi($sliceData->{stopAngle} <= 1.5*pi)); @@ -446,7 +446,7 @@ sub draw { } # Finally draw the top planes of each slice and the labels that are in front of the chart. - foreach $sliceData (@slices) { + foreach my $sliceData (@slices) { $self->drawTop($sliceData) if ($self->getTiltAngle != 0); if (_mod2pi($sliceData->{avgAngle}) > pi) { diff --git a/lib/WebGUI/Image/Graph/XYGraph/Bar.pm b/lib/WebGUI/Image/Graph/XYGraph/Bar.pm index 4c0e69a7a..62118e19f 100644 --- a/lib/WebGUI/Image/Graph/XYGraph/Bar.pm +++ b/lib/WebGUI/Image/Graph/XYGraph/Bar.pm @@ -123,7 +123,7 @@ Draws all the bars. =cut sub drawGraph { - my ($currentBar, %location); + my %location; my $self = shift; $self->processDataSet; @@ -137,7 +137,7 @@ sub drawGraph { $location{x} = $self->getChartOffset->{x} ; $location{y} = $self->getChartOffset->{y} + $self->getChartHeight; - foreach $currentBar (@{$self->{_bars}}) { + foreach my $currentBar (@{$self->{_bars}}) { if ($self->getDrawMode eq 'stacked') { $self->drawStackedBar($currentBar, \%location, $barWidth); } else { diff --git a/lib/WebGUI/Operation/Commerce.pm b/lib/WebGUI/Operation/Commerce.pm index f9c35a12f..cf2a72d57 100644 --- a/lib/WebGUI/Operation/Commerce.pm +++ b/lib/WebGUI/Operation/Commerce.pm @@ -404,7 +404,7 @@ C operation. sub www_checkoutSubmit { my $session = shift; my ($plugin, $shoppingCart, $transaction, $var, $amount, @cartItems, $i18n, @transactions, - @normal, $currentPurchase, $checkoutError, @resultLoop, %param, $normal, $recurring, + @normal, $checkoutError, @resultLoop, %param, $normal, $recurring, $formError, $shipping, $shippingCost, $shippingDescription); $i18n = WebGUI::International->new($session, 'Commerce'); @@ -449,7 +449,7 @@ sub www_checkoutSubmit { map {push(@transactions, {recurring => 1, items => [$_]})} @$recurring; push(@transactions, {recurring => 0, items => [@$normal]}) if (@$normal); - foreach $currentPurchase (@transactions) { + foreach my $currentPurchase (@transactions) { $amount = 0; $var = {}; @@ -634,7 +634,7 @@ Calls C on form submission. sub www_editCommerceSettings { my $session = shift; - my (%tabs, $tabform, $currentPlugin, $ac, $jscript, $i18n, + my (%tabs, $tabform, $ac, $jscript, $i18n, $paymentPlugin, @paymentPlugins, %paymentPlugins, @failedPaymentPlugins, $plugin, $shippingPlugin, @shippingPlugins, %shippingPlugins, @failedShippingPlugins); return $session->privilege->adminOnly unless canView($session); @@ -741,7 +741,7 @@ sub www_editCommerceSettings { -extras => 'onchange="activePayment=operateHidden(this.options[this.selectedIndex].value,activePayment)"' ); - foreach $currentPlugin (@paymentPlugins) { + foreach my $currentPlugin (@paymentPlugins) { my $style = '" style="display: none;' unless ($currentPlugin->namespace eq $paymentPlugin); $tabform->getTab('payment')->raw(''. ''. @@ -780,7 +780,7 @@ sub www_editCommerceSettings { -extras => 'onchange="activeShipping=operateHidden(this.options[this.selectedIndex].value,activeShipping)"' ); - foreach $currentPlugin (@shippingPlugins) { + foreach my $currentPlugin (@shippingPlugins) { my $style = '" style="display: none;' unless ($currentPlugin->namespace eq $shippingPlugin); $tabform->getTab('shipping')->raw('
'. ''. @@ -897,7 +897,7 @@ The screen is not templated. sub www_listTransactions { my $session = shift; - my ($output, %criteria, $transaction, @transactions); + my ($output, %criteria, @transactions); return $session->privilege->insufficient unless canView($session); @@ -968,7 +968,7 @@ sub www_listTransactions { ''. ''. ''; - foreach $transaction (@transactions) { + foreach my $transaction (@transactions) { $output .= ''; $output .= ''; my $userId = $transaction->get('userId'); diff --git a/lib/WebGUI/Operation/Graphics.pm b/lib/WebGUI/Operation/Graphics.pm index 041ede0b0..fb6a1dacf 100644 --- a/lib/WebGUI/Operation/Graphics.pm +++ b/lib/WebGUI/Operation/Graphics.pm @@ -289,7 +289,7 @@ sub www_editFontSave { #------------------------------------------------------------------- sub www_editPalette { - my ($name, $palette, $output, $color); + my ($name, $palette, $output); my $session = shift; my $paletteId = shift || $session->form->process('pid'); @@ -324,7 +324,7 @@ sub www_editPalette { $output .= '
'. $i18n->get('shipping cost'). ''. $i18n->get('status'). ''. $i18n->get('shipping status'). '
'.$session->icon->delete('op=deleteTransaction;tid='.$transaction->get('transactionId')).'
'; $output .= ''; - foreach $color (@{$palette->getColorsInPalette}) { + foreach my $color (@{$palette->getColorsInPalette}) { $output .= ''; $output .= '
'.$i18n->get('fill color').''.$i18n->get('stroke color').'
'; $output .= $session->icon->delete('op=removeColorFromPalette;pid='.$palette->getId.';index='.$palette->getColorIndex($color)); diff --git a/lib/WebGUI/Operation/ProductManager.pm b/lib/WebGUI/Operation/ProductManager.pm index 25b308d5b..b7826dead 100755 --- a/lib/WebGUI/Operation/ProductManager.pm +++ b/lib/WebGUI/Operation/ProductManager.pm @@ -852,7 +852,7 @@ The current WebGUI session object. sub www_manageProduct { my $session = shift; - my ($product, $output, $parameter, $option, $optionId, $i18n); + my ($product, $output, $option, $i18n); return $session->privilege->insufficient unless canView($session); @@ -882,14 +882,14 @@ sub www_manageProduct { $output .= "

Parameters

"; $output .= ''. $i18n->get('add parameter').'
'; - foreach $parameter (@{$product->getParameter}) { + foreach my $parameter (@{$product->getParameter}) { $output .= $session->icon->delete('op=deleteProductParameter;parameterId='.$parameter->{parameterId}). $session->icon->edit('op=editProductParameter;parameterId='.$parameter->{parameterId}); $output .= ''.$parameter->{name}.'
'; $output .= ''. $i18n->get('add option').'
'; - foreach $optionId (@{$parameter->{options}}) { + foreach my $optionId (@{$parameter->{options}}) { $option = $product->getOption($optionId); $output .= ''. $session->icon->delete('op=deleteProductParameterOption;optionId='.$option->{optionId}). diff --git a/lib/WebGUI/Operation/Profile.pm b/lib/WebGUI/Operation/Profile.pm index 4c074a5c2..cae2180b2 100644 --- a/lib/WebGUI/Operation/Profile.pm +++ b/lib/WebGUI/Operation/Profile.pm @@ -254,12 +254,12 @@ A reference to the current session. sub www_editProfileSave { my $session = shift; - my ($profile, $fieldName, $error, $u, $warning); + my ($profile, $error, $warning); return WebGUI::Operation::Auth::www_auth($session, "init") if ($session->user->userId eq '1'); ($profile, $error, $warning) = validateProfileData($session); $error .= $warning; return www_editProfile($session, '
    '.$error.'
') if($error ne ""); - foreach $fieldName (keys %{$profile}) { + foreach my $fieldName (keys %{$profile}) { $session->user->profileField($fieldName,$profile->{$fieldName}); } return WebGUI::Operation::Auth::www_auth($session); diff --git a/lib/WebGUI/PerformanceProfiler.pm b/lib/WebGUI/PerformanceProfiler.pm index 669557b97..5c69c8790 100755 --- a/lib/WebGUI/PerformanceProfiler.pm +++ b/lib/WebGUI/PerformanceProfiler.pm @@ -501,10 +501,9 @@ sub is_constant { } sub sum { - my ($sum, $elem); - $sum = 0; + my $sum = 0; my $arrRef = shift; - foreach $elem (@{$arrRef}) { $sum += $elem; } + foreach my $elem (@{$arrRef}) { $sum += $elem; } return($sum); }