oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into 8-merge

Browse source 
Conflicts:
	docs/gotcha.txt
	docs/upgrades/upgrade_7.9.8-7.9.9.pl
	lib/WebGUI.pm
	lib/WebGUI/Asset.pm
	lib/WebGUI/Asset/Template.pm
	lib/WebGUI/Asset/Wobject/Calendar.pm
	lib/WebGUI/Asset/Wobject/Carousel.pm
	t/Asset/Asset.t
	t/Mail/Send.t
	t/Session/Url.t
	t/lib/WebGUI/Test.pm
This commit is contained in:
Doug Bell 2010-07-14 17:06:19 -05:00
commit cd1e450c32
1229 changed files with 499 additions and 313891 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Session/Icon.pm
View file

@ -141,7 +141,9 @@ Any URL parameters that need to be tacked on to the current URL to accomplish wh
=head3 pageURL
The URL to any page. Defaults to the current page.
The URL to any page. Defaults to the current page. If a URL is passed, the gateway URL from the site's config
file will be prepended to it.
=head3 confirmText

11
lib/WebGUI/Session/Url.pm
View file

@ -408,9 +408,8 @@ sub makeCompliant {
$url =~ s{\s+$}{}; # remove trailing whitespace
$url =~ s{^/+}{}; # remove leading slashes
$url =~ s{/+$}{}; # remove trailing slashes
$url =~ s{[^\w/:._-]+}{-}g; # replace anything aside from word or other allowed characters with dashes
$url =~ s{//+}{/}g; # remove double slashes
$url =~ s{--+}{-}g; # remove double dashes
$url =~ s{[^\w/:.-]+}{-}g; # replace anything aside from word or other allowed characters with dashes
$url =~ tr{/-}{/-}s; # replace multiple slashes and dashes with singles.
return $url;
}
@ -533,16 +532,14 @@ The string to urlize.
=cut
sub urlize {
my $self = shift;
my ($value);
$value = lc(shift); #lower cases whole string
my $self = shift;
my $value = lc(shift); #lower cases whole string
$value = $self->makeCompliant($value);
# remove /./ or /../
$value =~ s{(^|/)(?:\.\.?/)*}{$1}g;
# remove trailing slashes
$value =~ s/\/$//;
return $value;
}