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

merging 5.8.0 and 6.1.1 changes

Browse source
This commit is contained in:
JT Smith 2004-07-18 17:43:08 +00:00
parent ae87943d1e
commit 797b8581b6
14 changed files with 109 additions and 16296 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/changelog/5.x.x.txt
View file

@ -1,3 +1,7 @@
5.5.8
- bugfix [ 991366 ] 5.5.7 typo in Macro/Synopsis.pm
- bugfix [ 992018 ] Synopsis(); macro generates error
5.5.7
- bugfix [ 935552 ] USS bug (w/ and w/o img mixed posts).
- bugfix [ 926610 ] WebGUI::Wobject::Article

20
docs/changelog/6.x.x.txt
View file

@ -1,14 +1,24 @@
6.2.0
- Added generateContent.pl script to generate content offline. This script is
not backwards compatible with previous WebGUI versions.
- Added metadata functionality to wobjects.
- Added a new passive profiling mechanism.
- Added a passive profile summarizer.
not backwards compatible with previous WebGUI versions. (Thanks to
DonorWare for funding this feature.)
- Added metadata functionality to wobjects. (Thanks to DonorWare for funding
this feature.)
- Added a new passive profiling mechanism. (Thanks to DonorWare for funding
this feature.)
- Added a passive profile summarizer. (Thanks to DonorWare for funding this
feature.)
- Added AOIRank and AOIHits macro's to retrieve user's Area's Of Interest
statistics.
statistics. (Thanks to DonorWare for funding this feature.)
- Fixed a typo in Forum/UI.pm
6.1.1
- bugfix [ 991313 ] Manage Translations doesn't work
- bugfix [ 991677 ] Preload erro my $i earlier declaration
- bugfix [ 991200 ] scriptUrl option in webgui.conf ignored
6.1.0
- Changed the output of upgrade.pl for better understanding.
- Added a --history option to upgrade.pl that displays the upgrade history

16173
docs/previousVersion.sql
View file

File diff suppressed because one or more lines are too long

3
docs/upgrades/upgrade_5.5.7-5.5.8.sql Normal file
View file

@ -0,0 +1,3 @@
insert into webguiVersion values ('5.5.8','upgrade',unix_timestamp());

0
docs/upgrades/upgrade_5.5.7-5.9.9.sql → docs/upgrades/upgrade_5.5.8-5.9.9.sql
View file

5
docs/upgrades/upgrade_6.1.0-6.1.1.sql Normal file
View file

@ -0,0 +1,5 @@
insert into webguiVersion values ('6.1.1','upgrade',unix_timestamp());
delete from groups where groupId=10;
delete from groupings where groupId=10;
delete from groupGroupings where groupId=10 or inGroup=10;

2
etc/WebGUI.conf.original
View file

@ -12,8 +12,6 @@ extrasPath = /data/WebGUI/www/extras
uploadsURL = /uploads
uploadsPath = /data/WebGUI/www/uploads
useSharedInternationalCache = 1
templateCacheType=file
emailRecoveryLoggingEnabled = 1

8
lib/WebGUI/Macro/AdminBar.pm
View file

@ -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

3
lib/WebGUI/Macro/Backslash_pageUrl.pm
View file

@ -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();
}

3
lib/WebGUI/Macro/Slash_gatewayUrl.pm
View file

@ -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();
}

3
lib/WebGUI/Session.pm
View file

@ -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;
}

4
lib/WebGUI/Style.pm
View file

@ -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>

62
lib/WebGUI/URL.pm
View file

@ -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]);
}

115
lib/WebGUI/i18n/English/WebGUI.pm
View file

@ -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