merging 5.8.0 and 6.1.1 changes
This commit is contained in:
JT Smith
parent
ae87943d1e
commit
797b8581b6
14 changed files with 109 additions and 16296 deletions
|
|
@ -27,7 +27,7 @@ sub process {
|
|||
my @param = WebGUI::Macro::getParams($_[0]);
|
||||
my $templateId = $param[0] || 1;
|
||||
my %var;
|
||||
my (%cphash, %hash2, %hash, $r, $i, @item, $query);
|
||||
my (%cphash, %hash2, %hash, $r, @item, $query);
|
||||
tie %hash, "Tie::IxHash";
|
||||
tie %hash2, "Tie::IxHash";
|
||||
tie %cphash, "Tie::CPHash";
|
||||
|
|
@ -182,12 +182,6 @@ sub process {
|
|||
%hash
|
||||
);
|
||||
}
|
||||
if (WebGUI::Grouping::isInGroup(10)) {
|
||||
%hash = (
|
||||
WebGUI::URL::page('op=listLanguages')=>WebGUI::International::get(585),
|
||||
%hash
|
||||
);
|
||||
}
|
||||
%hash = (
|
||||
WebGUI::URL::page('op=viewHelpIndex')=>WebGUI::International::get(13),
|
||||
%hash
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ package WebGUI::Macro::Backslash_pageUrl;
|
|||
|
||||
use strict;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::URL;
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub process {
|
||||
return $session{page}{url};
|
||||
return WebGUI::URL::page();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,11 @@ package WebGUI::Macro::Slash_gatewayUrl;
|
|||
|
||||
use strict;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::URL;
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub process {
|
||||
return ($session{config}{scripturl} || $session{env}{SCRIPT_NAME})."/";
|
||||
return WebGUI::URL::getSiteURL();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ sub _setupPageInfo {
|
|||
if($ENV{"MOD_PERL"}) {
|
||||
my $r = Apache->request;
|
||||
if(defined($r)) {
|
||||
$r->custom_response(404, $session{page}{url} );
|
||||
$r->custom_response(404, $pageName);
|
||||
$r->status(404);
|
||||
}
|
||||
} else {
|
||||
|
|
@ -96,7 +96,6 @@ sub _setupPageInfo {
|
|||
}
|
||||
}
|
||||
%page = WebGUI::SQL->quickHash("select * from page where pageId='".$pageId."'");
|
||||
$page{url} = ($session{config}{scripturl} || $session{env}{SCRIPT_NAME})."/".$page{urlizedTitle};
|
||||
$session{page} = \%page;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ use Tie::CPHash;
|
|||
use WebGUI::International;
|
||||
use WebGUI::Session;
|
||||
use WebGUI::Template;
|
||||
|
||||
use WebGUI::URL;
|
||||
|
||||
=head1 NAME
|
||||
|
||||
|
|
@ -115,7 +115,7 @@ sub process {
|
|||
function getWebguiProperty (propName) {
|
||||
var props = new Array();
|
||||
props["extrasURL"] = "'.$session{config}{extrasURL}.'";
|
||||
props["pageURL"] = "'.$session{page}{url}.'";
|
||||
props["pageURL"] = "'.WebGUI::URL::page().'";
|
||||
return props[propName];
|
||||
}
|
||||
</script>
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ This package provides URL writing functionality. It is important that all WebGUI
|
|||
$url = WebGUI::URL::append($url,$pairs);
|
||||
$string = WebGUI::URL::escape($string);
|
||||
$url = WebGUI::URL::gateway($url,$pairs);
|
||||
$url = WebGUI::URL::getSiteURL();
|
||||
$url = WebGUI::URL::makeCompliant($string);
|
||||
$url = WebGUI::URL::makeAbsolute($url);
|
||||
$url = WebGUI::URL::page($url,$pairs);
|
||||
|
|
@ -49,27 +50,6 @@ These subroutines are available from this package:
|
|||
=cut
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
sub _getSiteURL {
|
||||
my $site;
|
||||
my @sitenames;
|
||||
if (ref $session{config}{sitename} eq "ARRAY") {
|
||||
@sitenames = @{$session{config}{sitename}};
|
||||
} else {
|
||||
push(@sitenames,$session{config}{sitename});
|
||||
}
|
||||
if ($session{setting}{hostToUse} eq "sitename" || !isIn($session{env}{HTTP_HOST},@sitenames)) {
|
||||
$site = $session{config}{defaultSitename};
|
||||
} else {
|
||||
$site = $session{env}{HTTP_HOST} || $session{config}{defaultSitename};
|
||||
}
|
||||
my $proto = "http://";
|
||||
if ($session{env}{SERVER_PORT} == 443) {
|
||||
$proto = "https://";
|
||||
}
|
||||
return $proto.$site;
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
|
|
@ -150,7 +130,7 @@ Name value pairs to add to the URL in the form of:
|
|||
=cut
|
||||
|
||||
sub gateway {
|
||||
my $url = _getSiteURL().($session{config}{scripturl} || $session{env}{SCRIPT_NAME}).'/'.$_[0];
|
||||
my $url = getSiteURL().$_[0];
|
||||
if ($_[1]) {
|
||||
$url = append($url,$_[1]);
|
||||
}
|
||||
|
|
@ -186,6 +166,42 @@ sub makeAbsolute {
|
|||
return URI->new_abs($url,$baseURL);
|
||||
}
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 getSiteURL ( )
|
||||
|
||||
Returns a constructed site url from protocol to gateway.
|
||||
|
||||
=cut
|
||||
|
||||
sub getSiteURL {
|
||||
my $site;
|
||||
my @sitenames;
|
||||
if (ref $session{config}{sitename} eq "ARRAY") {
|
||||
@sitenames = @{$session{config}{sitename}};
|
||||
} else {
|
||||
push(@sitenames,$session{config}{sitename});
|
||||
}
|
||||
if ($session{setting}{hostToUse} eq "sitename" || !isIn($session{env}{HTTP_HOST},@sitenames)) {
|
||||
$site = $session{config}{defaultSitename};
|
||||
} else {
|
||||
$site = $session{env}{HTTP_HOST} || $session{config}{defaultSitename};
|
||||
}
|
||||
my $proto = "http://";
|
||||
if ($session{env}{SERVER_PORT} == 443) {
|
||||
$proto = "https://";
|
||||
}
|
||||
my $scripturl;
|
||||
if (exists $session{config}{scripturl}) {
|
||||
$scripturl .= $session{config}{scripturl};
|
||||
} else {
|
||||
$scripturl .= $session{env}{SCRIPT_NAME};
|
||||
}
|
||||
$scripturl .= '/';
|
||||
return $proto.$site.$scripturl;
|
||||
}
|
||||
|
||||
|
||||
#-------------------------------------------------------------------
|
||||
|
||||
=head2 makeCompliant ( string )
|
||||
|
|
@ -235,7 +251,7 @@ Name value pairs to add to the URL in the form of:
|
|||
=cut
|
||||
|
||||
sub page {
|
||||
my $url = _getSiteURL().$session{page}{url};
|
||||
my $url = getSiteURL().$session{page}{urlizedTitle};
|
||||
if ($_[0]) {
|
||||
$url = append($url,$_[0]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2457,71 +2457,6 @@ The form footer.
|
|||
context => q|A label indicating how many threads there are in a particular forum.|
|
||||
},
|
||||
|
||||
'584' => {
|
||||
message => q|Add a new translation.|,
|
||||
lastUpdated => 1036971092
|
||||
},
|
||||
|
||||
'585' => {
|
||||
message => q|Manage translations.|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'586' => {
|
||||
message => q|Manage Translations|,
|
||||
lastUpdated => 1036971445
|
||||
},
|
||||
|
||||
'587' => {
|
||||
message => q|Are you certain you wish to delete this language and all the help and international messages that go with it?|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'589' => {
|
||||
message => q|Edit Translation|,
|
||||
lastUpdated => 1036971172
|
||||
},
|
||||
|
||||
'590' => {
|
||||
message => q|Language ID|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'591' => {
|
||||
message => q|Language|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'592' => {
|
||||
message => q|Character Set|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'595' => {
|
||||
message => q|International Messages|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'596' => {
|
||||
message => q|MISSING|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'597' => {
|
||||
message => q|Edit International Message|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'598' => {
|
||||
message => q|Edit this translation.|,
|
||||
lastUpdated => 1036971142
|
||||
},
|
||||
|
||||
'601' => {
|
||||
message => q|International ID|,
|
||||
lastUpdated => 1031514049
|
||||
},
|
||||
|
||||
'784' => {
|
||||
message => q|Thumbnail|,
|
||||
lastUpdated => 1036954393
|
||||
|
|
@ -4054,51 +3989,6 @@ You can find out more about karma in <a href="http://www.plainblack.com/ruling_w
|
|||
lastUpdated => 1052850265
|
||||
},
|
||||
|
||||
'588' => {
|
||||
message => q|Are you certain you wish to submit this translation to Plain Black for inclusion in the official distribution of WebGUI? By clicking on the yes link you understand that you're giving Plain Black an unlimited license to use the translation in its software distributions.|,
|
||||
lastUpdated => 1031514630
|
||||
},
|
||||
|
||||
'593' => {
|
||||
message => q|Submit this translation.|,
|
||||
lastUpdated => 1036970850
|
||||
},
|
||||
|
||||
'594' => {
|
||||
message => q|Translate messages.|,
|
||||
lastUpdated => 1031514314
|
||||
},
|
||||
|
||||
'722' => {
|
||||
message => q|Id|,
|
||||
lastUpdated => 1031517195
|
||||
},
|
||||
|
||||
'721' => {
|
||||
message => q|Namespace|,
|
||||
lastUpdated => 1031515005
|
||||
},
|
||||
|
||||
'720' => {
|
||||
message => q|OK|,
|
||||
lastUpdated => 1031514777
|
||||
},
|
||||
|
||||
'719' => {
|
||||
message => q|Out of Date|,
|
||||
lastUpdated => 1031514679
|
||||
},
|
||||
|
||||
'718' => {
|
||||
message => q|Export this translation.|,
|
||||
lastUpdated => 1036970877
|
||||
},
|
||||
|
||||
'723' => {
|
||||
message => q|Deprecated|,
|
||||
lastUpdated => 1031800566
|
||||
},
|
||||
|
||||
'725' => {
|
||||
message => q|Your username cannot be blank.|,
|
||||
lastUpdated => 1031879612
|
||||
|
|
@ -4109,11 +3999,6 @@ You can find out more about karma in <a href="http://www.plainblack.com/ruling_w
|
|||
lastUpdated => 1031879593
|
||||
},
|
||||
|
||||
'791' => {
|
||||
message => q|Delete this translation.|,
|
||||
lastUpdated => 1036970806
|
||||
},
|
||||
|
||||
'802' => {
|
||||
message => q|WebGUI is not currently tracking page statistics. You can enable this feature in the settings.|,
|
||||
lastUpdated => 1036979395
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue