diff --git a/lib/WebGUI/HTML.pm b/lib/WebGUI/HTML.pm index 01e6782f2..2cf4f2ddd 100644 --- a/lib/WebGUI/HTML.pm +++ b/lib/WebGUI/HTML.pm @@ -159,7 +159,6 @@ sub format { } } elsif ($contentType eq "text") { $content =~ s/\t/    /g; - $content =~ s/ / /g; $content =~ s/\n/\
/g; } elsif ($contentType eq "code") { $content =~ s/&/&/g; diff --git a/lib/WebGUI/Operation/Page.pm b/lib/WebGUI/Operation/Page.pm index 3665989c7..6291cedd8 100644 --- a/lib/WebGUI/Operation/Page.pm +++ b/lib/WebGUI/Operation/Page.pm @@ -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; diff --git a/lib/WebGUI/Wobject/SyndicatedContent.pm b/lib/WebGUI/Wobject/SyndicatedContent.pm index 6284856c5..90d71d8de 100644 --- a/lib/WebGUI/Wobject/SyndicatedContent.pm +++ b/lib/WebGUI/Wobject/SyndicatedContent.pm @@ -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); diff --git a/lib/WebGUI/Wobject/USS.pm b/lib/WebGUI/Wobject/USS.pm index 889ee28a1..ce0c19f79 100644 --- a/lib/WebGUI/Wobject/USS.pm +++ b/lib/WebGUI/Wobject/USS.pm @@ -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&wid=".$_[0]->get("wobjectId")."&sid=".$submission->{USS_submissionId}); if ($session{form}{forumOp}) { return WebGUI::Forum::UI::forumOp({ diff --git a/www/extras/addHTTP.js b/www/extras/addHTTP.js index 0a3cc1ba8..b19c7780e 100644 --- a/www/extras/addHTTP.js +++ b/www/extras/addHTTP.js @@ -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."); } } }