--- loncom/interface/lonhtmlcommon.pm	2010/10/04 14:34:46	1.284
+++ loncom/interface/lonhtmlcommon.pm	2011/01/18 22:59:06	1.289
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.284 2010/10/04 14:34:46 www Exp $
+# $Id: lonhtmlcommon.pm,v 1.289 2011/01/18 22:59:06 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -60,6 +60,7 @@ use Time::Local;
 use Time::HiRes;
 use Apache::lonlocal;
 use Apache::lonnet;
+use HTML::Entities();
 use LONCAPA;
 
 sub java_not_enabled {
@@ -83,6 +84,22 @@ sub raw_href_to_link {
    return $message;
 }
 
+sub entity_encode {
+    my ($text)=@_;
+    return &HTML::Entities::encode($text, '<>&"');
+}
+
+sub direct_parm_link {
+    my ($linktext,$symb,$filter,$part,$target)=@_;
+    $symb=&entity_encode($symb);
+    $filter=&entity_encode($filter);
+    $part=&entity_encode($part);
+    if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
+       return "<a href='/adm/parmset?symb=$symb&filter=$filter&part=$part'>$linktext</a>";
+    } else {
+       return $linktext;
+    }
+}
 ##############################################
 ##############################################
 
@@ -1407,6 +1424,34 @@ sub htmlareabrowser {
     return 1;
 }
 
+#
+# Should the "return to content" link be shown?
+#
+
+sub show_return_link {
+
+    unless ($env{'request.course.id'}) { return 0; }
+    if ($env{'request.noversionuri'}=~m{^/priv/} ||
+        $env{'request.uri'}=~m{^/~}) { return 1; }
+
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
+        || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
+
+        return if ($env{'form.register'});
+    }
+    return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
+             $env{'request.symb'} eq '')
+            ||
+            ($env{'request.noversionuri'}=~ m{^/cgi-bin/printout.pl})
+            ||
+            (($env{'request.noversionuri'}=~/^\/adm\//) &&
+             ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
+             ($env{'request.noversionuri'}!~
+              m{^/adm/.*/(smppg|bulletinboard)($|\?)})
+           ));
+}
+
+
 ############################################################
 ############################################################
 
@@ -1492,22 +1537,28 @@ returns: nothing
                 $last = $menulink;
             }
         }
-        my $links = join "", 
+        my $links;
+        if ((&show_return_link) && (!$CourseBreadcrumbs)) {
+           $links=&htmltag( 'a',"<img src='/res/adm/pages/reload.png' border='0' style='vertical-align:middle;' />",
+                            { href => '/adm/flip?postdata=return:',
+                              title => &mt("Back to most recent content resource") });
+        }
+        $links.= join "", 
              map {
                  $faq  = $_->{'faq'}  if (exists($_->{'faq'}));
                  $bug  = $_->{'bug'}  if (exists($_->{'bug'}));
                  $help = $_->{'help'} if (exists($_->{'help'}));
 
-                 my $result = $_->{no_mt} ? $_->{text} : mt($_->{text});
+                 my $result = $_->{no_mt} ? $_->{text} : &mt($_->{text});
 
                  if ($_->{href}){
-                     $result = htmltag( 'a', $result, 
+                     $result = &htmltag( 'a', $result, 
                        { href   => $_->{href},
-                         title  => $_->{no_mt} ? $_->{title} : mt($_->{title}),
+                         title  => $_->{no_mt} ? $_->{title} : &mt($_->{title}),
                          target => $_->{target}, });
                  }
 
-                 $result = htmltag( 'li', "$result $crumbsymbol");
+                 $result = &htmltag( 'li', "$result $crumbsymbol");
              } @Crumbs;
 
         #should the last Element be translated?
@@ -1517,7 +1568,7 @@ returns: nothing
 
         # last breadcrumb is the first order heading of a page
         # for course breadcrumbs it's just bold
-        $links .= htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
+        $links .= &htmltag( 'li', htmltag($CourseBreadcrumbs ? 'b' : 'h1',
                 $lasttext), {title => $lasttext});
 
         my $icons = '';
@@ -1540,23 +1591,23 @@ returns: nothing
 		
 
         unless ($CourseBreadcrumbs) {
-            $links = htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
+            $links = &htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
         } else {
-            $links = htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
+            $links = &htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
         }
 
         if ($component) {
-            $links = htmltag('span', 
+            $links = &htmltag('span', 
                              ( $no_mt ? $component : mt($component) ).
                              ( $icons ? $icons : '' ),
                              { class => 'LC_breadcrumbs_component' } )
                              .$links;
         }
         
-        render_tools(\$links);
-        $links = htmltag('div', $links, 
+        &render_tools(\$links);
+        $links = &htmltag('div', $links, 
                         { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
-        render_advtools(\$links);
+        &render_advtools(\$links);
 
         # Return the @Crumbs stack to what we started with
         push(@Crumbs,$last);
@@ -1603,7 +1654,7 @@ returns: nothing
     sub add_breadcrumb_tool {
         my ($category, @html) = @_;
         return unless @html;
-        if (!defined(%tools)) { 
+        if (!keys(%tools)) { 
             %tools = ( navigation => [], tools => [], advtools => []);
         }
 
@@ -1611,7 +1662,7 @@ returns: nothing
         @html = grep {defined $_ && $_ ne ''} @html;
         for (@html) { 
             s/align="(right|left)"//; 
-            s/<span.*?\/span>// if $category ne 'advtools'; 
+#            s/<span.*?\/span>// if $category ne 'advtools'; 
         } 
 
         push @{$tools{$category}}, @html;
@@ -1643,7 +1694,7 @@ returns: nothing
 #TODO might split this in separate functions for each category
     sub render_tools {
         my ($breadcrumbs) = @_;
-        return unless defined %tools;
+        return unless (keys(%tools));
 
         my $navigation = list_from_array($tools{navigation}, 
                    { listattr => { class=>"LC_breadcrumb_tools_navigation" } });
@@ -2105,30 +2156,30 @@ sub echo_form_input {
         if ($key =~ /^form\.(.+)$/) {
             my $name = $1;
             my $match = 0;
-            if ((!@{$excluded}) || (!grep/^$name$/,@{$excluded})) {
-                if (defined($regexps)) {
-                    if (@{$regexps} > 0) {
-                        foreach my $regexp (@{$regexps}) {
-                            if ($name =~ /\Q$regexp\E/) {
-                                $match = 1;
-                                last;
-                            }
+            if (ref($excluded) eq 'ARRAY') {    
+                next if (grep(/^\Q$name\E$/,@{$excluded}));
+            }
+            if (ref($regexps) eq 'ARRAY') {
+                if (@{$regexps} > 0) {
+                    foreach my $regexp (@{$regexps}) {
+                        if ($name =~ /$regexp/) {
+                            $match = 1;
+                            last;
                         }
                     }
                 }
-                if (!$match) {
-                    if (ref($env{$key})) {
-                        foreach my $value (@{$env{$key}}) {
-                            $value = &HTML::Entities::encode($value,'<>&"');
-                            $output .= '<input type="hidden" name="'.$name.
-                                             '" value="'.$value.'" />'."\n";
-                        }
-                    } else {
-                        my $value = &HTML::Entities::encode($env{$key},'<>&"');
-                        $output .= '<input type="hidden" name="'.$name.
-                                             '" value="'.$value.'" />'."\n";
-                    }
+            }
+            next if ($match);
+            if (ref($env{$key}) eq 'ARRAY') {
+                foreach my $value (@{$env{$key}}) {
+                    $value = &HTML::Entities::encode($value,'<>&"');
+                    $output .= '<input type="hidden" name="'.$name.
+                               '" value="'.$value.'" />'."\n";
                 }
+            } else {
+                my $value = &HTML::Entities::encode($env{$key},'<>&"');
+                $output .= '<input type="hidden" name="'.$name.
+                           '" value="'.$value.'" />'."\n";
             }
         }
     }
@@ -2429,6 +2480,7 @@ returns: XHTML list as String.
 # \@items, {listattr => { class => 'abc', id => 'xyx' }, itemattr => {class => 'abc', id => 'xyx'}}
 sub list_from_array {
     my ($items, $args) = @_;
+    return unless (ref($items) eq 'ARRAY');
     return unless scalar @$items;
     my ($ul, $li) = inittags( qw(ul li) );
     my $listitems = join '', map { $li->($_, $args->{itemattr}) } @$items;
@@ -2641,6 +2693,7 @@ returns: XHTML list as string.
 
 sub funclist_from_array {
     my ($items, $args) = @_;
+    return unless(ref($items) eq 'ARRAY');
     $args->{legend} ||= mt('Functions');
     return list_from_array( [$args->{legend}, @$items], 
                { listattr => {class => 'LC_funclist'} });