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

merging 5.4.4 changes

Browse source
This commit is contained in:
JT Smith 2003-09-14 21:43:20 +00:00
parent 2b6d4a36fc
commit 6272369816
12 changed files with 1842 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -182,6 +182,7 @@ sub www_view {
#if ($_[0]->get("followExternal")==0 && $proxiedUrl !~ /\Q$allowed_url/i) {
if ($_[0]->get("followExternal")==0 &&
$var{header} = "text/html";
(URI->new($_[0]->get('proxiedUrl'))->host) ne (URI->new($proxiedUrl)->host) ) {
return "<h1>You are not allowed to leave ".$_[0]->get("proxiedUrl")."</h1>";
}
@ -271,6 +272,7 @@ sub www_view {
$p->DESTROY;
if ($var{content} =~ /<frame/gis) {
$var{header} = "text/html";
$var{content} = "<h1>HttpProxy: Can't display frames</h1>
Try fetching it directly <a href='$proxiedUrl'>here.</a>";
} else {
@ -280,6 +282,7 @@ sub www_view {
}
}
} else { # Fetching page failed...
$var{header} = "text/html";
$var{content} = "<b>Getting <a href='$proxiedUrl'>$proxiedUrl</a> failed</b>".
"<p><i>GET status line: ".$response->status_line."</i>";
}

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

@ -724,7 +724,7 @@ sub www_viewGradebook {
return "" unless (WebGUI::Privilege::isInGroup($_[0]->get("groupToViewReports")));
my ($output, $p, $users, $user);
$output = '<h1>'.WebGUI::International::get(71,$_[0]->get("namespace")).'</h1>';
$p = WebGUI::Paginator->new('func=viewGradebook&wid='.$_[0]->get("wobjectId"));
$p = WebGUI::Paginator->new(WebGUI::URL::page('func=viewGradebook&wid='.$_[0]->get("wobjectId")));
$p->setDataByQuery("select userId,username,ipAddress from Survey_response
group by userId,username,ipAddress order by username,ipAddress");
$users = $p->getPageData;