Interface updates to line up with changes to webserver

opentrafficshaper/plugins/webserver/pages/index.pm

@@ -33,16 +33,13 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 
 sub _catchall
 {
-	my ($kernel,$globals,$module,$daction,$request) = @_;
+	my ($kernel,$globals,$client_session_id,$request) = @_;
 
 
-	# If we not passed default by the main app, just return
-	return if ($daction ne "default");
-
 	# Build content
 	my $content = "";
 
-	$content .= "Hi there: $daction";
+	$content .= "Hi there: ".$request->uri->as_string();
 
 
 	return (200,$content);

opentrafficshaper/plugins/webserver/pages/static.pm

@@ -43,7 +43,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 
 sub _catchall
 {
-	my ($kernel,$globals,$module,$daction,$request) = @_;
+	my ($kernel,$globals,$client_session_id,$request) = @_;
 	my $logger = $globals->{'logger'};
 
 
@@ -100,7 +100,7 @@ sub _catchall
 	if (defined $ims) {
 		my $time = HTTP::Date::str2time($ims);
 		if (defined($time) && $time >= $stat->mtime) {
-			return HTTP::Response->new(HTTP::Status::RC_NOT_MODIFIED,$request->method." $daction")
+			return HTTP::Response->new(HTTP::Status::RC_NOT_MODIFIED,$request->method." ".$resource)
 		}
 	}
 	# Set header for file modified

opentrafficshaper/plugins/webserver/pages/users.pm

@@ -54,14 +54,11 @@ my $menu = {
 # Default page/action
 sub default
 {
-	my ($kernel,$globals,$module,$daction,$request) = @_;
+	my ($kernel,$globals,$client_session_id,$request) = @_;
 
-	# If we not passed default by the main app, just return
-	return if ($daction ne "default");
 
 	my $users = $globals->{'users'};
 
-
 	# Build content
 	my $content = "";
 
@@ -141,7 +138,7 @@ EOF
 # Add action
 sub add
 {
-	my ($kernel,$globals,$module,$daction,$request) = @_;
+	my ($kernel,$globals,$client_session_id,$request) = @_;
 
 
 	# Setup our environment