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

fixed a bunch of bugs

Browse source
This commit is contained in:
JT Smith 2005-05-23 15:02:23 +00:00
parent 3b5a7d6f52
commit fd57cbaa51
8 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/AdminConsole.pm
View file

@ -34,7 +34,7 @@ Package to manipulate items in WebGUI's asset system. Replaces Collateral.
An asset is the basic class of content in WebGUI. This handles security, urls, and other basic information common to all content items.
A lineage is a concatenated series of sequence numbers, each six digits long, that explain an asset's position in its familiy tree. Lineage describes who the asset's anscestors are, how many ancestors the asset has in its family tree (lineage length), and the asset's position (rank) amongst its siblings. In addition, lineage provides enough information about an asset to generate a list of its siblings and descendants.
A lineage is a concatenated series of sequence numbers, each six digits long, that explain an asset's position in its familiy tree. Lineage describes who the asset's ancestors are, how many ancestors the asset has in its family tree (lineage length), and the asset's position (rank) amongst its siblings. In addition, lineage provides enough information about an asset to generate a list of its siblings and descendants.
use WebGUI::Asset;

3
lib/WebGUI/Asset/Redirect.pm
View file

@ -17,6 +17,7 @@ package WebGUI::Asset::Redirect;
use strict;
use WebGUI::Asset;
use WebGUI::HTTP;
use WebGUI::Macro;
use WebGUI::Session;
our @ISA = qw(WebGUI::Asset);
@ -150,7 +151,7 @@ sub www_view {
if ($session{var}{adminOn}) {
return $self->getContainer->www_view;
}
WebGUI::HTTP::setRedirect($self->get("redirectUrl")) unless $self->newByUrl($self->get("redirectUrl"))->getUrl eq $self->getUrl;
WebGUI::HTTP::setRedirect(WebGUI::Macro::process($self->get("redirectUrl"))) unless $self->newByUrl($self->get("redirectUrl"))->getUrl eq $self->getUrl;
return "Redirect is self-referential";
}

1
lib/WebGUI/Asset/RichEdit.pm
View file

@ -412,6 +412,7 @@ sub getRichEditor {
mode => "specific_textareas",
theme => "advanced",
document_base_url => "/",
auto_reset_designmode => "true",
cleanup_callback => "tinyMCE_WebGUI_Cleanup",
urlconvertor_callback => "tinyMCE_WebGUI_URLConvertor",
theme_advanced_buttons1 => join(",",@toolbarRow1),

2
lib/WebGUI/Form.pm
View file

@ -1432,7 +1432,7 @@ sub phone {
return text({
name=>$params->{name},
maxlength=>$maxLength,
extras=>'onKeyUp="doInputCheck(this.form.'.$params->{name}.',\'0123456789-()+ \')" '.$params->{extras},
extras=>'onkeyup="doInputCheck(this.form.'.$params->{name}.',\'0123456789-()+ \')" '.$params->{extras},
value=>$params->{value},
size=>$params->{size},
defaultValue=>$params->{defaultValue}

7
lib/WebGUI/HTTP.pm
View file

@ -80,7 +80,12 @@ sub getHeader {
$params{"-cookie"} = $session{http}{cookie};
my $status = getStatus();
if($session{env}{MOD_PERL}) {
my $r = Apache->request;
my $r;
if ($$mod_perl::VERSION >= 1.999023) {
$r = Apache2::RequestUtil->request;
} else {
$r = Apache->request;
}
if(defined($r)) {
$r->custom_response($status, '<!-- '.$session{http}{statusDescription}.' -->' );
$r->status($status);

7
lib/WebGUI/Session.pm
View file

@ -118,7 +118,12 @@ sub _setupUserInfo {
}
$session{user} = \%user;
if ($session{env}{MOD_PERL}) {
my $r = Apache->request;
my $r;
if ($$mod_perl::VERSION >= 1.999023) {
$r = Apache2::RequestUtil->request;
} else {
$r = Apache->request;
}
if(defined($r)) {
$r->user($session{user}{username});
}