[Lxr-commits] CVS: lxr/lib/LXR Common.pm,1.56,1.57
Brought to you by:
ajlittoz
|
From: Jan-Benedict G. <jb...@us...> - 2006-12-20 19:48:14
|
Update of /cvsroot/lxr/lxr/lib/LXR In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv31732/lib/LXR Modified Files: Common.pm Log Message: Remove redundant whitespace. Index: Common.pm =================================================================== RCS file: /cvsroot/lxr/lxr/lib/LXR/Common.pm,v retrieving revision 1.56 retrieving revision 1.57 diff -u -d -r1.56 -r1.57 --- Common.pm 20 Dec 2006 19:43:48 -0000 1.56 +++ Common.pm 20 Dec 2006 19:48:11 -0000 1.57 @@ -457,7 +457,7 @@ # httpinit - parses and cleans up the URL parameters and sets up the various variables # Also prints the HTTP header & sets up the signal handlers # This is also where we protect from malicious input -# +# # HTTP: # path_info - # param - Array of parameters @@ -490,7 +490,7 @@ # remove the param versions to prevent unclean versions being used delete $HTTP->{'param'}->{'i'}; delete $HTTP->{'param'}->{'identifier'}; - + $config = new LXR::Config($HTTP->{'this_url'}); die "Can't find config for " . $HTTP->{'this_url'} if !defined($config); $files = new LXR::Files($config->sourceroot, $config->sourceparams); @@ -505,7 +505,7 @@ $release = clean_release($config->variable('v')); $config->variable('v', $release); # put back into config obj - + $HTTP->{'param'}->{'file'} = clean_path($HTTP->{'param'}->{'file'}); $pathname = fixpaths($HTTP->{'path_info'} || $HTTP->{'param'}->{'file'}); @@ -517,7 +517,7 @@ my @rels= $config->varrange('v'); my %test; @test{@rels} = undef; - + if(!exists $test{$release}) { $release = $config->vardefault('v'); } @@ -535,7 +535,7 @@ sub clean_path { # Cleans up a string to path my $path = shift; - + if(defined $path) { # First suppress anything after a dodgy character $path =~ s!(^[\w_+\-,\.%\^/\!]+).*!$1!; @@ -544,10 +544,10 @@ $path =~ s!/\.\.?/!/!g; } } - + return $path; } - + sub httpclean { $config = undef; $files = undef; @@ -564,14 +564,14 @@ if (defined($expfun = $expfunc{$2})) { if ($3 eq '') { &$expfun(undef); - } + } else { $exppar = $4; $exppar =~ s#\01#\{#gs; $exppar =~ s#\02#\}#gs; &$expfun($exppar); } - } + } else { $1; } |