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

more bug fixes

Browse source
This commit is contained in:
JT Smith 2005-03-18 05:14:02 +00:00
parent f232b6facb
commit 40065e93e8
10 changed files with 33 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -22,6 +22,8 @@
- fix [ 1165373 ] sort templates into folders by namespace under ImportNode
- fix [ 1118789 ] 6.2.11 - L_loginBox display with empty 1st param [colink]
- fix [ 1165635 ] IndexedSearch - double toolbar in AdminMode [mwilson]
- fix [ 1165598 ] Auth module numeric comparisons against Ids
- Fixed a bunch of Collaboration System template problems.
6.5.2

7
docs/upgrades/upgrade_6.5.2-6.5.3.pl
View file

@ -21,7 +21,8 @@ WebGUI::Session::open("../..",$configFile);
#--------------------------------------------
print "\tSorting templates under the Import Node into folders by namespace.\n" unless ($quiet);
my ($templateFolder) = WebGUI::SQL->quickArray("select assetId from asset where parentId='PBasset000000000000002' and className='WebGUI::Asset::Wobject::Folder' and title='Templates' limit 1");
my $namespacesQuery = "select distinct template.namespace from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace";
$templateFolder ||= 'PBasset000000000000002';
my $namespacesQuery = "select distinct template.namespace from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' order by template.namespace";
my $parent = WebGUI::Asset->new($templateFolder);
my $sth = WebGUI::SQL->read($namespacesQuery);
my $folder;
@ -43,7 +44,7 @@ while (my $namespace = $sth->hashRef) {
groupIdEdit=>'3',
description=>''
});
my $templatesquery = "select * from asset, template where asset.parentId='".$templateFolder."' and asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc";
my $templatesquery = "select * from asset, template where asset.assetId=template.assetId and asset.className='WebGUI::Asset::Template' and template.namespace='".$namespace->{namespace}."' order by title asc";
my $newParentId = $folder->getId;
my $sth2 = WebGUI::SQL->read($templatesquery);
my $first = 1;
@ -81,4 +82,4 @@ sub getNextLineage {
my $rank = substr($startLineage,$depth,6);
my $parentLineage = substr($startLineage,0,$depth);
return $parentLineage.sprintf("%06d",($rank+1));
}
}

5
docs/upgrades/upgrade_6.5.2-6.5.3.sql
View file

File diff suppressed because one or more lines are too long

9
lib/WebGUI/Asset/Post.pm
View file

@ -900,6 +900,7 @@ sub www_edit {
}
$var{'form.footer'} = WebGUI::Form::formFooter();
$var{usePreview} = $self->getThread->getParent->get("usePreview");
$var{'user.isModerator'} = $self->getThread->getParent->canModerate;
$var{'user.isVisitor'} = ($session{user}{userId} eq '1');
$var{'visitorName.form'} = WebGUI::Form::text({
name=>"visitorName",
@ -966,13 +967,17 @@ sub www_edit {
name=>'contentType',
value=>$self->getValue("contentType") || "mixed"
});
my $startDate = $self->get("startDate");
$startDate = WebGUI::DateTime::setToEpoch($session{form}{startDate}) if ($session{form}{startDate});
$var{'startDate.form'} = WebGUI::Form::dateTime({
name => 'startDate',
value => $self->getValue("startDate")
value => $startDate
});
my $endDate = $self->get("endDate");
$endDate = WebGUI::DateTime::setToEpoch($session{form}{endDate}) if ($session{form}{endDate});
$var{'endDate.form'} = WebGUI::Form::dateTime({
name => 'endDate',
value => $self->getValue("endDate")
value => $endDate
});
$self->getThread->getParent->appendTemplateLabels(\%var);
return $self->getThread->getParent->processStyle($self->processTemplate(\%var,$self->getThread->getParent->get("postFormTemplateId")));

1
lib/WebGUI/Asset/Wobject/Collaboration.pm
View file

@ -158,6 +158,7 @@ sub appendTemplateLabels {
$var->{'startDate.label'} = $i18n->get("start date");
$var->{"stick.label"} = $i18n->get("sticky");
$var->{"status.label"} = $i18n->get("status");
$var->{"synopsis.label"} = $i18n->get("synopsis");
$var->{"thumbnail.label"} = $i18n->get("thumbnail");
$var->{"title.label"} = $i18n->get("title");
$var->{"layout.threaded.label"} = $i18n->get("threaded");

6
lib/WebGUI/Asset/Wobject/WSClient.pm
View file

@ -7,6 +7,7 @@ use SOAP::Lite;
use Storable;
use WebGUI::Cache;
use WebGUI::ErrorHandler;
use WebGUI::HTTP;
use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Paginator;
@ -514,9 +515,8 @@ sub view {
if ($session{'config'}{'soapHttpHeaderOverride'} &&
$self->get("httpHeader")) {
$session{'header'}{'mimetype'} = $self->get("httpHeader");
WebGUI::ErrorHandler::warn("changed mimetype: " .
$session{'header'}{'mimetype'});
WebGUI::HTTP::setMimeType($self->get("httpHeader"));
WebGUI::ErrorHandler::warn("changed mimetype: " . $session{'header'}{'mimetype'});
}
# Note, we still process our template below even though it will never

4
lib/WebGUI/Auth.pm
View file

@ -61,7 +61,7 @@ sub _isDuplicateUsername {
my $self = shift;
my $username = shift;
#Return false if the user is already logged in, but not changing their username.
return 0 if($self->userId != 1 && $session{user}{username} eq $username);
return 0 if($self->userId ne "1" && $session{user}{username} eq $username);
my ($otherUser) = WebGUI::SQL->quickArray("select count(*) from users where username=".quote($username));
return 0 if !$otherUser;
$self->error('<li>'.WebGUI::International::get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.WebGUI::DateTime::epochToHuman(time(),"%y").'"');
@ -81,7 +81,7 @@ sub _isValidUsername {
my $username = shift;
my $error = "";
return 1 if($self->userId != 1 && $session{user}{username} eq $username);
return 1 if($self->userId ne "1" && $session{user}{username} eq $username);
if ($username =~ /^\s/ || $username =~ /\s$/) {
$error .= '<li>'.WebGUI::International::get(724);

4
lib/WebGUI/Auth/LDAP.pm
View file

@ -172,7 +172,7 @@ sub authenticate {
sub createAccount {
my $self = shift;
my $vars;
if ($session{user}{userId} != 1) {
if ($session{user}{userId} ne "1") {
return $self->displayAccount;
} elsif (!$session{setting}{anonymousRegistration}) {
return $self->displayLogin;
@ -268,7 +268,7 @@ sub displayAccount {
sub displayLogin {
my $self = shift;
my $vars;
return $self->displayAccount($_[0]) if ($self->userId != 1);
return $self->displayAccount($_[0]) if ($self->userId ne "1");
$vars->{'login.message'} = $_[0] if ($_[0]);
return $self->SUPER::displayLogin("login",$vars);
}

8
lib/WebGUI/Auth/WebGUI.pm
View file

@ -158,7 +158,7 @@ sub authenticate {
sub createAccount {
my $self = shift;
my $vars;
if ($session{user}{userId} != 1) {
if ($session{user}{userId} ne "1") {
return $self->displayAccount;
} elsif (!$session{setting}{anonymousRegistration}) {
return $self->displayLogin;
@ -190,7 +190,7 @@ sub createAccount {
sub createAccountSave {
my $self = shift;
return $self->displayAccount if ($session{user}{userId} != 1);
return $self->displayAccount if ($session{user}{userId} ne "1");
my $username = $session{form}{'authWebGUI.username'};
my $password = $session{form}{'authWebGUI.identifier'};
@ -290,7 +290,7 @@ sub displayAccount {
sub displayLogin {
my $self = shift;
my $vars;
return $self->displayAccount($_[0]) if ($self->userId != 1);
return $self->displayAccount($_[0]) if ($self->userId ne "1");
$vars->{'login.message'} = $_[0] if ($_[0]);
$vars->{'recoverPassword.isAllowed'} = $self->getSetting("passwordRecovery");
$vars->{'recoverPassword.url'} = WebGUI::URL::page('op=auth&method=recoverPassword');
@ -494,7 +494,7 @@ sub new {
#-------------------------------------------------------------------
sub recoverPassword {
my $self = shift;
return $self->displayLogin if($self->userId != 1);
return $self->displayLogin if($self->userId ne "1");
my $template = 'Auth/WebGUI/Recovery';
my $vars;
$vars->{title} = WebGUI::International::get(71);

5
lib/WebGUI/i18n/English/Collaboration.pm
View file

@ -236,6 +236,11 @@ our $I18N = {
lastUpdated => 1109696029,
},
'synopsis' => {
message => q|Synopsis|,
lastUpdated => 1109696029,
},
'start date' => {
message => q|Start Date|,
lastUpdated => 1109696029,