[system] / trunk / webwork2 / lib / WeBWorK / ContentGenerator.pm Repository:
ViewVC logotype

Diff of /trunk/webwork2/lib/WeBWorK/ContentGenerator.pm

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 691 Revision 692
238} 238}
239 239
240sub navMacro { 240sub navMacro {
241 my $self = shift; 241 my $self = shift;
242 my %args = %{ shift() }; 242 my %args = %{ shift() };
243 my $tail = shift;
243 my @links = @_; 244 my @links = @_;
244 my $auth = $self->url_authen_args; 245 my $auth = $self->url_authen_args;
245 my @result; 246 my @result;
246 while (@links) { 247 while (@links) {
247 my $name = shift @links; 248 my $name = shift @links;
248 my $url = shift @links; 249 my $url = shift @links;
249 push @result, $url 250 push @result, $url
250 ? CGI::a({-href=>"$url?$auth"}, $name) 251 ? CGI::a({-href=>"$url?$auth$tail"}, $name)
251 : $name; 252 : $name;
252 } 253 }
253 return join($args{separator}, @result), "\n"; 254 return join($args{separator}, @result), "\n";
254} 255}
255 256
366 my $r = $self->{r}; 367 my $r = $self->{r};
367 my $user = $r->param("user"); 368 my $user = $r->param("user");
368 my $eUser = $r->param("effectiveUser"); 369 my $eUser = $r->param("effectiveUser");
369 my $key = $r->param("key"); 370 my $key = $r->param("key");
370 return "" unless $key; 371 return "" unless $key;
371 warn "user=$user eUser=$eUser\n"; 372 my $exitURL = $r->uri() . "?user=$user&key=$key";
372 print CGI::small("Logged in as:", CGI::br(), "$user"); 373 print CGI::small("Logged in as:", CGI::br(), "$user");
373 if ($user ne $eUser) { 374 if ($user ne $eUser) {
374 print CGI::br(), CGI::font({-color=>'red'}, CGI::small("Acting as:", CGI::br(), "$eUser")); 375 print CGI::br(), CGI::font({-color=>'red'},
376 CGI::small("Acting as:", CGI::br(), "$eUser")
377 ),
378 CGI::br(), CGI::a({-href=>$exitURL},
379 CGI::small("Stop Acting")
380 );
375 } 381 }
376 return ""; 382 return "";
377} 383}
378 384
379# *** drunk code. rewrite. 385# *** drunk code. rewrite.

Legend:
Removed from v.691  
changed lines
  Added in v.692

aubreyja at gmail dot com
ViewVC Help
Powered by ViewVC 1.0.9