aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLouis <spalax@gresille.org>2014-11-14 12:50:17 +0100
committerLouis <spalax@gresille.org>2014-11-14 12:50:17 +0100
commit1d97160dae775c31e166d9886472dacdd773d571 (patch)
treea5bfd2ce50cbc4df4a303df06d0c21a62c7c6e38
parentf35b62d4547c2c42373584016bcbf97472e3ae3a (diff)
downloadikiwiki-1d97160dae775c31e166d9886472dacdd773d571.tar
ikiwiki-1d97160dae775c31e166d9886472dacdd773d571.tar.gz
Indentation
-rw-r--r--IkiWiki/Plugin/calendar.pm102
1 files changed, 51 insertions, 51 deletions
diff --git a/IkiWiki/Plugin/calendar.pm b/IkiWiki/Plugin/calendar.pm
index 65ed16ed4..83d65d0c3 100644
--- a/IkiWiki/Plugin/calendar.pm
+++ b/IkiWiki/Plugin/calendar.pm
@@ -108,20 +108,20 @@ sub month_days {
sub build_affected {
my %affected;
- my ($ayear, $amonth, $valid);
-
- foreach my $year (keys %changed) {
- ($ayear, $valid) = nextyear($year, $config{archivebase});
- $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
- ($ayear, $valid) = previousyear($year, $config{archivebase});
- $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
- foreach my $month (keys $changed{$year}) {
- ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase});
- $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
- ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase});
- $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
- }
- }
+ my ($ayear, $amonth, $valid);
+
+ foreach my $year (keys %changed) {
+ ($ayear, $valid) = nextyear($year, $config{archivebase});
+ $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
+ ($ayear, $valid) = previousyear($year, $config{archivebase});
+ $affected{calendarlink($ayear)} = sprintf(gettext("building calendar for %s, its previous or next year has changed"), $ayear) if ($valid);
+ foreach my $month (keys $changed{$year}) {
+ ($ayear, $amonth, $valid) = nextmonth($year, $month, $config{archivebase});
+ $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
+ ($ayear, $amonth, $valid) = previousmonth($year, $month, $config{archivebase});
+ $affected{calendarlink($ayear, sprintf("%02d", $amonth))} = sprintf(gettext("building calendar for %s/%s, its previous or next month has changed"), $amonth, $ayear) if ($valid);
+ }
+ }
return %affected;
}
@@ -219,9 +219,9 @@ sub gencalendaryear {
}
sub previousmonth($$$) {
- my $year = shift;
- my $month = shift;
- my $archivebase = shift;
+ my $year = shift;
+ my $month = shift;
+ my $archivebase = shift;
my $pmonth = $month;
my $pyear = $year;
@@ -230,16 +230,16 @@ sub previousmonth($$$) {
if ($pmonth == 0) {
$pyear -= 1;
$pmonth = 12;
- return ($pyear, $pmonth, 0) unless $pyear >= $wikistate{calendar}{minyear};
+ return ($pyear, $pmonth, 0) unless $pyear >= $wikistate{calendar}{minyear};
}
}
- return ($pyear, $pmonth, 1);
+ return ($pyear, $pmonth, 1);
}
sub nextmonth($$$) {
- my $year = shift;
- my $month = shift;
- my $archivebase = shift;
+ my $year = shift;
+ my $month = shift;
+ my $archivebase = shift;
my $nmonth = $month;
my $nyear = $year;
@@ -248,34 +248,34 @@ sub nextmonth($$$) {
if ($nmonth == 13) {
$nyear += 1;
$nmonth = 1;
- return ($nyear, $nmonth, 0) unless $nyear <= $wikistate{calendar}{maxyear};
+ return ($nyear, $nmonth, 0) unless $nyear <= $wikistate{calendar}{maxyear};
}
}
- return ($nyear, $nmonth, 1);
+ return ($nyear, $nmonth, 1);
}
sub previousyear($$) {
- my $year = shift;
- my $archivebase = shift;
-
- my $pyear = $year - 1;
- while (not exists $pagesources{"$archivebase/$pyear"}) {
- $pyear -= 1;
- return ($pyear, 0) unless ($pyear >= $wikistate{calendar}{minyear});
- }
- return ($pyear, 1);
+ my $year = shift;
+ my $archivebase = shift;
+
+ my $pyear = $year - 1;
+ while (not exists $pagesources{"$archivebase/$pyear"}) {
+ $pyear -= 1;
+ return ($pyear, 0) unless ($pyear >= $wikistate{calendar}{minyear});
+ }
+ return ($pyear, 1);
}
sub nextyear($$) {
- my $year = shift;
- my $archivebase = shift;
-
- my $nyear = $year + 1;
- while (not exists $pagesources{"$archivebase/$nyear"}) {
- $nyear += 1;
- return ($nyear, 0) unless ($nyear <= $wikistate{calendar}{maxyear});
- }
- return ($nyear, 1);
+ my $year = shift;
+ my $archivebase = shift;
+
+ my $nyear = $year + 1;
+ while (not exists $pagesources{"$archivebase/$nyear"}) {
+ $nyear += 1;
+ return ($nyear, 0) unless ($nyear <= $wikistate{calendar}{maxyear});
+ }
+ return ($nyear, 1);
}
sub format_month (@) {
@@ -303,9 +303,9 @@ sub format_month (@) {
my $archivebase = 'archives';
$archivebase = $config{archivebase} if defined $config{archivebase};
$archivebase = $params{archivebase} if defined $params{archivebase};
-
- my ($pyear, $pmonth, $pvalid) = previousmonth($params{year}, $params{month}, $archivebase);
- my ($nyear, $nmonth, $nvalid) = nextmonth($params{year}, $params{month}, $archivebase);
+
+ my ($pyear, $pmonth, $pvalid) = previousmonth($params{year}, $params{month}, $archivebase);
+ my ($nyear, $nmonth, $nvalid) = nextmonth($params{year}, $params{month}, $archivebase);
# Add padding.
$pmonth=sprintf("%02d", $pmonth);
@@ -492,8 +492,8 @@ sub format_year (@) {
$archivebase = $config{archivebase} if defined $config{archivebase};
$archivebase = $params{archivebase} if defined $params{archivebase};
- my ($pyear, $pvalid) = previousyear($params{year}, $archivebase);
- my ($nyear, $nvalid) = nextyear($params{year}, $archivebase);
+ my ($pyear, $pvalid) = previousyear($params{year}, $archivebase);
+ my ($nyear, $nvalid) = nextyear($params{year}, $archivebase);
my $thisyear = $now[5]+1900;
my $future_month = 0;
@@ -628,10 +628,10 @@ sub preprocess (@) {
}
$params{month} = sprintf("%02d", $params{month});
- if (not exists $changed{$params{year}}) {
- $changed{$params{year}} = ();
- }
- $changed{$params{year}}{$params{month}} = 1;
+ if (not exists $changed{$params{year}}) {
+ $changed{$params{year}} = ();
+ }
+ $changed{$params{year}}{$params{month}} = 1;
if ($params{type} eq 'month' && $params{year} == $thisyear
&& $params{month} == $thismonth) {