//i) {
- my $name=lc($1);
- my $extra=$2;
- my $val=$query->param($name);
- if(defined $val) {
- push @params,$name;
- } else {
- if($extra=~/DEFAULT=(.*)/i) {
- $val=$1;
- } else {
- &usererror("Must specify $name parameter for this template");
- }
- }
- $template=~s/\$$name/&encode_entities($val)/ieg;
-}
+my @params=&handleparameters($query,\$template);
hunk ./cgi-bin/range.pl 69
-my ($startnum,$isprev,$isnext)=(0,0,0);
-my $endnum = @photos;
-my $page;
-my $max;
+my $startnum=0;
+my $endnum=scalar @photos - 1;
hunk ./cgi-bin/range.pl 82
-if($endnum == 0 ) {
+if($endnum == -1 ) {
hunk ./cgi-bin/range.pl 87
-if($template=~/\/i) {
- $max=$1;
- if($max!~/none/i) {
- $page=defined $query->param('page') ? $query->param('page') : 1;
- untaint(\$page,'\d+',"page must be a positive integer");
hunk ./cgi-bin/range.pl 88
- $startnum=($page-1)*$max;
- $endnum=$page*$max-1;
+# string for links to different pages of the same range, if needed
hunk ./cgi-bin/range.pl 90
- $isprev=1;
- if($startnum<=0) {
- $startnum=0;
- $isprev=0;
- }
- $isnext=1;
- if($endnum>=(@photos-1)) {
- $endnum=@photos - 1;
- $isnext=0;
- }
- # Now shorten @photos to account for the pages
- my @fullphotos = @photos;
- @photos = @fullphotos[$startnum..$endnum];
-
- if( $debug >= 1 ) {
- print "\nstart $startnum\nend $endnum\n";
- foreach my $p (@photos) {
- print $p."\n";
- }
- print "\n";
- }
- }
-}
-
-$template=~s/\//ig;
-$template=~s/\$page/$page/g;
-
-# Work out the string for links to different pages of the same range,
-# if it will be needed
-
hunk ./cgi-bin/range.pl 92
-if($isprev || $isnext) {
- $rangequery=$linkroots{'range'}.'?range='.&uri_escape($range);
- if(defined $query->param('titlehash')) {
- $rangequery.="&titlehash=".&uri_escape($query->param('titlehash'));
- }
- $rangequery.="&style=".&uri_escape($style);
- foreach my $param (@params) {
- $rangequery.='&'.&uri_escape($param)
- .'='.&uri_escape($query->param($param));
- }
+&handlepages($query,\$template,\$startnum,\$endnum,
+ sub {
+ $rangequery=$linkroots{'range'}.'?range='.&uri_escape($range);
+ if(defined $query->param('titlehash')) {
+ $rangequery.="&titlehash="
+ .&uri_escape($query->param('titlehash'));
+ }
+ $rangequery.="&style=".&uri_escape($style);
+ foreach my $param (@params) {
+ $rangequery.='&'.&uri_escape($param)
+ .'='.&uri_escape($query->param($param));
+ }
+ },
+ sub {
+ my ($pagenum)=@_;
+ return "$rangequery&page=$pagenum";
+ });
hunk ./cgi-bin/range.pl 110
- # Handle has pages / no pages
- $template=~s/\(.*?)\<\/IFPAGES\>/$1/sig;
- $template=~s/\(.*?)\<\/NOPAGES\>//sig;
-} else {
- # Handle has pages / no pages
- $template=~s/\(.*?)\<\/IFPAGES\>//sig;
- $template=~s/\(.*?)\<\/NOPAGES\>/$1/sig;
-}
+# shorten @photos to account for the pages
+@photos = @photos[$startnum..$endnum];
hunk ./cgi-bin/range.pl 113
-# Deal with link to the next page
-
-if($isnext) {
- $template=~s/\(.*?)\<\/IFNEXT\>/$1/sig;
- # $page was untainted to only contain numbers earlier
- my $nextpage=$page+1;
- $template=~s/\//sig;
- $template=~s/\.*?\<\/ELSENEXT\>//sig;
-} else {
- $template=~s/\.*?\<\/IFNEXT\>//sig;
- $template=~s/\(.*?)\<\/ELSENEXT\>/$1/sig;
+if( $debug >= 1 ) {
+ print "\nstart $startnum\nend $endnum\n";
+ foreach my $p (@photos) {
+ print $p."\n";
+ }
+ print "\n";
hunk ./cgi-bin/range.pl 121
-# Deal with link to the previous page
-
-if($isprev) {
- $template=~s/\(.*?)\<\/IFPREV\>/$1/sig;
- # $page was untainted to only contain numbers earlier
- my $prevpage=$page-1;
- $template=~s/\//sig;
- $template=~s/\.*?\<\/ELSEPREV\>//sig;
-} else {
- $template=~s/\.*?\<\/IFPREV\>//sig;
- $template=~s/\(.*?)\<\/ELSEPREV\>/$1/sig;
-}
-
hunk ./cgi-bin/range.pl 128
- $template=~s/\(.*?)\<\/IFTITLE\>/$1/sig;
- $template=~s/\(.*?)\<\/IFNOTITLE\>//sig;
+ &includetag('iftitle',\$template);
+ &excludetag('ifnotitle',\$template);
hunk ./cgi-bin/range.pl 132
- $template=~s/\(.*?)\<\/IFTITLE\>//sig;
- $template=~s/\(.*?)\<\/IFNOTITLE\>/$1/sig;
+ &excludetag('iftitle',\$template);
+ &includetag('ifnotitle',\$template);
+ $template=~s/\$title//ig;
hunk ./cgi-bin/range.pl 152
- $section=~s/\(.*?)\<\/ifdescr\>/$1/sig;
+ &includetag('ifdescr',\$section);
hunk ./cgi-bin/range.pl 157
- $section=~s/\.*?\<\/ifdescr\>//sig;
- $section=~s/\$description//gi;
+ &excludetag('ifdescr',\$section);
+ $section=~s/\$description//ig;
hunk ./dist/album-book.thtml 22
-
+
hunk ./dist/downwards.thtml 1
+
hunk ./dist/downwards.thtml 4
-
+
+
+
+
+
+
hunk ./dist/downwards.thtml 24
+Previous $maxitems items
+Next $maxitems items
hunk ./doc/thtml-guide 28
- .... - replace this with a link to the group,
- with a style of foo (style="foo" is optional)
- .... - replace this with a link to the album,
- with a style of foo (style="foo" is optional)
+
+ ....
+ ....
+ - replace this with a link to the group/album, with a style of "foo".
+ In each case style="foo" is optional if an appropriate default exists,
+ and "foo" can be either a relative or an absolute reference.
+
}