diff --git a/Slash/DB/MySQL/MySQL.pm b/Slash/DB/MySQL/MySQL.pm index 9297286d0..527d29993 100644 --- a/Slash/DB/MySQL/MySQL.pm +++ b/Slash/DB/MySQL/MySQL.pm @@ -8308,10 +8308,14 @@ sub getDay { sub getDayFromDay { my($self, $day, $days_back) = @_; $day =~ s/-//g; - my ($y, $m, $d) = $day =~ /(\d{4})(\d{2})(\d{2})/; + my($y, $m, $d) = $day =~ /(\d{4})(\d{2})(\d{2})/; my $return_day; if ($y) { - $return_day = timeCalc(scalar localtime(timelocal(0, 0, 0, $d, $m - 1, $y - 1900) - 86400 * $days_back), "%Y%m%d"); + $return_day = timeCalc( + scalar localtime( + timelocal(0, 0, 0, $d, $m - 1, $y - 1900) - 86400 * $days_back + ), "%Y%m%d" + ); } else { $return_day = $self->getDay(0) if !$y; } @@ -12192,18 +12196,17 @@ sub getClassForAjaxOp { } sub insertMediaFile { - my ($self, $stoid, $name); + my($self, $stoid, $name) = @_; return $self->sqlInsert("stories_media", { stoid => $stoid, name => $name }, { ignore => 1 }); } sub updateMediaFile { - my ($self, $name, $data); + my($self, $name, $data) = @_; $self->sqlUpdate("stories_media", $data, "name=$name"); } sub getMediaFiles { - my ($self, $stoid); - + my($self, $stoid) = @_; return $self->sqlSelectAllHashrefArray('smid, name', 'stories_media', "stoid=$stoid" @@ -12211,7 +12214,7 @@ sub getMediaFiles { } sub getMediaFile { - my ($self, $data); + my($self, $data) = @_; if ($data =~ /\d+/) { return $self->sqlSelect("width, height, location", "stories_media", "smid=$data"); diff --git a/Slash/Slash.pm b/Slash/Slash.pm index 654dfb808..f395e2801 100644 --- a/Slash/Slash.pm +++ b/Slash/Slash.pm @@ -1661,11 +1661,11 @@ sub getOlderDays { } sub getOlderDaysFromDay { - my ($day, $start, $end, $options) = @_; + my($day, $start, $end, $options) = @_; my $slashdb = getCurrentDB(); - $day ||= $slashdb->getDay(0); - $start ||= 0; - $end ||= 0; + $day ||= $slashdb->getDay(0); + $start ||= 0; + $end ||= 0; $options ||= {}; my $days = []; @@ -1674,7 +1674,7 @@ sub getOlderDaysFromDay { my $weekago = $slashdb->getDay(7); for ($start..$end) { - my $the_day = $slashdb->getDayFromDay($day, $_); + my $the_day = $slashdb->getDayFromDay($day, $_); push @$days, $the_day if $the_day < $today; } if ($today > $days->[0]) { @@ -1685,7 +1685,7 @@ sub getOlderDaysFromDay { my $ret_array = []; foreach (@$days) { my $label; - my ($y, $m, $d) = $_ =~ /(\d{4})(\d{2})(\d{2})/; + my($y, $m, $d) = $_ =~ /(\d{4})(\d{2})(\d{2})/; if ($_ eq $today) { $label = "Today"; } elsif ($_ eq $yesterday) {