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

merging 5.5.6. changes

Browse source
This commit is contained in:
JT Smith 2004-04-11 20:46:37 +00:00
parent dc41a0c9ae
commit a8c39c01c1
10 changed files with 63 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/DateTime.pm
View file

@ -262,7 +262,7 @@ sub epochToHuman {
my ($offset, $temp, $hour12, $value, $output);
$offset = $session{user}{timeOffset} || 0;
$offset = $offset*3600;
$temp = int($_[0]) || time();
$temp = int($_[0]) || WebGUI::DateTime::time();
$temp = $temp+$offset;
my ($year,$month,$day,$hour,$min,$sec) = epochToArray($temp);
$output = $_[1] || "%z %Z";
@ -785,7 +785,7 @@ A string in the format of YYYY-MM-DD or YYYY-MM-DD HH:MM:SS.
=cut
sub setToEpoch {
my @now = epochToArray(time());
my @now = epochToArray(WebGUI::DateTime::time());
my ($date,$time) = split(/ /,$_[0]);
my ($year, $month, $day) = split(/\-/,$date);
my ($hour, $minute, $second) = split(/\:/,$time);

8
lib/WebGUI/FormProcessor.pm
View file

@ -67,6 +67,10 @@ These functions are available from this package:
=cut
sub _checkEmailAddy {
return ($_[0] =~ /^([A-Z0-9]+[._-]?){1,}([A-Z0-9]+[_-]?)+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i);
}
#-------------------------------------------------------------------
=head2 checkbox ( name )
@ -211,7 +215,7 @@ The name of the form variable to retrieve.
=cut
sub email {
if ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[._-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
if (_checkEmailAddy($session{form}{$_[0]})) {
return $session{form}{$_[0]};
}
return undef;
@ -671,7 +675,7 @@ The name of the form variable to retrieve.
sub url {
if ($session{form}{$_[0]} =~ /mailto:/) {
return $session{form}{$_[0]};
} elsif ($session{form}{$_[0]} =~ /^([A-Z0-9]+[._]?){1,}[A-Z0-9]+\@(([A-Z0-9]+[-]?){1,}[A-Z0-9]+\.){1,}[A-Z]{2,4}$/i) {
} elsif (_checkEmailAddy($session{form}{$_[0]})) {
return "mailto:".$session{form}{$_[0]};
} elsif ($session{form}{$_[0]} =~ /:\/\//) {
return $session{form}{$_[0]};

3
lib/WebGUI/Operation/Page.pm
View file

@ -331,6 +331,9 @@ sub www_editPage {
$page{title} = $page{menuTitle} = $page{urlizedTitle} = $page{synopsis} = '';
$page{parentId} = $session{form}{npp};
$page{ownerId} = $session{user}{userId};
$page{hideFromNavigation} = 0;
$page{newWindow} = 0;
$page{redirectURL} = "";
} else {
%page = %{$session{page}};
($childCount) = WebGUI::SQL->quickArray("select count(*) from page where parentId=$page{pageId}");

5
lib/WebGUI/Session.pm
View file

@ -407,6 +407,11 @@ sub open {
$session{config}{extrasURL} = $session{config}{extrasURL} || $session{config}{extras} || "/extras";
$session{config}{extras} = $session{config}{extras} || $session{config}{extrasURL}; # for backward compatibility
$session{config}{extrasPath} = $session{config}{extrasPath} || "/data/WebGUI/www/extras";
if (ref $session{config}{sitename} eq "ARRAY") {
$session{config}{defaultSitename} = $session{config}{sitename}[0];
} else {
$session{config}{defaultSitename} = $session{config}{sitename};
}
###----------------------------
### default database handler object
$session{dbh} = DBI->connect($session{config}{dsn},$session{config}{dbuser},$session{config}{dbpass},{ RaiseError=>0,AutoCommit=>1 });

30
lib/WebGUI/URL.pm
View file

@ -47,22 +47,28 @@ These subroutines are available from this package:
=cut
#-------------------------------------------------------------------
sub _getSiteURL {
my $site;
if ($session{setting}{hostToUse} eq "sitename") {
$site = $session{config}{sitename} || $session{env}{HTTP_HOST};
} else {
$site = $session{env}{HTTP_HOST} || $session{config}{sitename};
}
my $proto = "http://";
if ($session{env}{SERVER_PORT} == 443) {
$proto = "https://";
}
return $proto.$site;
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;
}
#-------------------------------------------------------------------
=head2 append ( url, pairs )

2
lib/WebGUI/Wobject/DataForm.pm
View file

@ -295,7 +295,7 @@ sub getRecordTemplateVars {
my $hidden = (($data{status} eq "hidden" && !$session{var}{adminOn}) || ($data{isMailField} && !$self->get("mailData")));
my $value = $data{value};
$value = WebGUI::DateTime::epochToHuman($value,"%z") if ($data{type} eq "date");
$value = WebGUI::DateTime::epochToHuman($value) if ($data{type} eq "dateTime");
$value = WebGUI::DateTime::epochToHuman($value,"%z %Z") if ($data{type} eq "dateTime");
push(@fields,{
"tab.field.form" => _createField(\%data),
"tab.field.name" => $data{name},