removed the notion of scripturl since it's no longer necessary with the modperl handler

This commit is contained in:
JT Smith 2005-11-09 23:44:03 +00:00
parent 784a0c3986
commit 9e37cdd9a2
8 changed files with 11 additions and 42 deletions

View file

@ -284,18 +284,20 @@
- fix [ 1251390 ] Security tab doesn't appear for member of Admins
- HTTP Proxy URLs can now be up to 2048 characters long.
- The Edit Branch function now allows you to recursively set meta data.
(Thanks to Volvo for funding this feature.)
- Fixed a potential problem where editing a page under rare very rare
conditions could destroy the not found page.
- Added the ability to override the UI Level of any field in the edit form of
any asset in the WebGUI config file.
any asset in the WebGUI config file. (Thanks to Volvo for funding this
feature.)
- Translation providers can now add languageAbbreviation and locale
properties to their translation in order to activate the translations of
javascript helper components like the rich editor and the calendar
date picker.
- Added the ability to override the UI Level of an entire asset in the config
file.
file. (Thanks to Volvo for funding this feature.)
- fix [ 1229042 ] crumbtrail should show full path...
- Added asset versioning.
- Added asset versioning. (Thanks to Volvo for contributing funding to this feature.)
- fix [ 1229188 ] typo in Help: Collaboration, Post List Template Variables
- fix [ 1221284 ] Operation\user.pm i18n {internationalize labels}
- All form field labels have been internationalized.

View file

@ -29,12 +29,6 @@ uploadsPath = /data/WebGUI/www/uploads
# passthruUrls => /icons, /documentation/pdf, /my-custom-application, /server-status, /perl-status
# The scripturl tells WebGUI how to reference the gateway script
# when generating URLs. By default it will use the gateway
# script's filename like /index.pl/
# scripturl = /
# Tell WebGUI where to store cached files. Defaults to the
# /tmp or c:\temp folder depending upon your operating system.

View file

@ -341,7 +341,7 @@ sub getListTemplateVars {
$fields->finish;
$var->{field_loop} = \@fieldLoop;
my @recordLoop;
$entries = WebGUI::SQL->read("select ipAddress,username,userid,submissionDate,DataForm_entryId from DataForm_entry
my $entries = WebGUI::SQL->read("select ipAddress,username,userid,submissionDate,DataForm_entryId from DataForm_entry
where assetId=".quote($self->getId)." order by submissionDate desc");
while (my $record = $entries->hashRef) {
my @dataLoop;

View file

@ -468,7 +468,7 @@ sub configurationForm {
-value => '<br />'
);
$f->readOnly(
-value => $i18n->get('extra info').'<br /><b>https://'.$session{config}{defaultSitename}.WebGUI::URL::getScriptURL().'?op=confirmRecurringTransaction;gateway='.$self->namespace
-value => $i18n->get('extra info').'<br /><b>https://'.$session{config}{defaultSitename}.'/?op=confirmRecurringTransaction;gateway='.$self->namespace
);
return $self->SUPER::configurationForm($f->printRowsOnly);

View file

@ -163,10 +163,6 @@ sub readConfig {
if (ref $data{shippingPlugins} ne "ARRAY") {
$data{shippingPlugins} = [$data{shippingPlugins}] if ($data{shippingPlugins});
}
if( defined( $data{scripturl} ) ) {
# get rid of leading "/" if present.
$data{scripturl} =~ s/^\///;
}
if (ref $data{sitename} eq "ARRAY") {
$data{defaultSitename} = $data{sitename}[0];
} else {

View file

@ -16,9 +16,7 @@ use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
my $pathinfo = $session{wguri};
$pathinfo =~ s#^/##;
return WebGUI::URL::getScriptURL().$pathinfo;
return $session{wguri};
}

View file

@ -11,12 +11,10 @@ package WebGUI::Macro::Slash_gatewayUrl;
#-------------------------------------------------------------------
use strict;
use WebGUI::Session;
use WebGUI::URL;
#-------------------------------------------------------------------
sub process {
return WebGUI::URL::getScriptURL();
return "/";
}

View file

@ -121,7 +121,7 @@ Name value pairs to add to the URL in the form of:
sub gateway {
$_[0] =~ s/^\///;
my $url = getScriptURL().$_[0];
my $url = '/'.$_[0];
if ($session{setting}{preventProxyCache} == 1) {
$url = append($url,"noCache=".randint(0,1000).';'.time());
}
@ -167,25 +167,6 @@ sub setSiteURL {
#-------------------------------------------------------------------
=head2 getScriptURL {
Returns the URL for the gateway script.
=cut
sub getScriptURL {
my $scripturl;
if (exists $session{config}{scripturl}) {
$scripturl = $session{config}{scripturl};
} else {
$scripturl = $session{wguri};
}
$scripturl .= '/';
return $scripturl;
}
#-------------------------------------------------------------------
=head2 getSiteURL ( )
Returns a constructed site url. The returned
@ -262,7 +243,7 @@ sub page {
if ($useFullUrl) {
$url = getSiteURL();
}
$url .= getScriptURL();
$url .= '/';
my $pathinfo;
if ($session{asset}) {
$pathinfo = $session{asset}->get("url");