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

merging 5.5.4 bugfixes

Browse source
This commit is contained in:
JT Smith 2004-01-01 23:08:28 +00:00
parent 1dba651ea1
commit a7ccedb956
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/WebGUI/HTML.pm
View file

@ -159,7 +159,6 @@ sub format {
}
} elsif ($contentType eq "text") {
$content =~ s/\t/    /g;
$content =~ s/ / /g;
$content =~ s/\n/\<br \/\>/g;
} elsif ($contentType eq "code") {
$content =~ s/&/&amp;/g;

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

@ -586,6 +586,7 @@ sub www_moveTreePageRight {
#-------------------------------------------------------------------
sub www_pastePage {
return "" if ($session{page}{pageId} == $session{form}{pageId}); # don't let it paste to itself
my ($output, $nextSeq);
($nextSeq) = WebGUI::SQL->quickArray("select max(sequenceNumber) from page where parentId=$session{page}{pageId}");
$nextSeq += 1;

3
lib/WebGUI/Wobject/SyndicatedContent.pm
View file

@ -217,7 +217,8 @@ sub _get_rss_data {
}
_strip_html($rss);
$rss->{items} = [ $rss->{items} ] unless (ref $rss->{items} eq 'ARRAY');
_normalize_items($rss->{items});
$cache->set(Storable::freeze($rss), 3600);

7
lib/WebGUI/Wobject/USS.pm
View file

@ -676,7 +676,7 @@ sub www_viewRSS {
my $res = WebGUI::SQL->read
("select USS_submissionId, content, title, " .
"dateSubmitted, username from USS_submission " .
"where USS_id = " .$session{dbh}->quote($_[0]->get("USS_id")) . " " .
"where USS_id = " .$session{dbh}->quote($_[0]->get("USS_id")) . " and status='Approved' " .
"order by ".$_[0]->getValue("sortBy")." ".$_[0]->getValue("sortOrder")." limit " . $numResults);
while (my $row = $res->{_sth}->fetchrow_arrayref()) {
@ -717,7 +717,10 @@ sub www_viewSubmission {
return "" unless ($session{form}{sid});
my ($file, @data, %var, $replies);
my $submission = $_[0]->getCollateral("USS_submission","USS_submissionId",$session{form}{sid});
return $_[0]->www_view unless ($submission->{USS_submissionId});
return "" unless ($submission->{USS_submissionId});
return "" unless ($submission->{status} eq 'Approved' ||
($submission->{userId} == $session{user}{userId} && $session{user}{userId} != 1) ||
WebGUI::Privilege::isInGroup($_[0]->getValue("groupToApprove")));
my $callback = WebGUI::URL::page("func=viewSubmission&amp;wid=".$_[0]->get("wobjectId")."&amp;sid=".$submission->{USS_submissionId});
if ($session{form}{forumOp}) {
return WebGUI::Forum::UI::forumOp({

6
www/extras/addHTTP.js
View file

@ -1,10 +1,10 @@
function addHTTP(element) {
if (element.value != "") {
if (!element.value.match("http://")) {
if (!element.value.match(/^\w+:\/\//)) {
element.value = "http://"+element.value;
}
if (!element.value.match(/^http:\/\/.+\..+/)){
alert("This is not a valid url. Please check if it is correct.");
if (!element.value.match(/^\w+:\/\/.+\..+/)){
alert("That does not look like a proper URL. Please check if it is correct.");
}
}
}