--- loncom/interface/lonwhatsnew.pm	2012/10/04 06:07:11	1.105.2.3
+++ loncom/interface/lonwhatsnew.pm	2013/03/05 23:42:37	1.105.2.5
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.3 2012/10/04 06:07:11 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.105.2.5 2013/03/05 23:42:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -285,6 +285,11 @@ END
         $scripttag.='document.visible.submit();
 }
 
+function thresholdreset() {
+    document.visible.command.value="reset";
+    document.visible.submit();
+}
+
 function togglelogins() {
     var total = document.visible.logincount.value;
     var sumrow = document.visible.loginrow.value;
@@ -527,28 +532,33 @@ sub display_actions_box {
         $headings{'crslogin'} = &mt('Last login for users in last 24 hours');
     }
 
-    my $now = time;
+    my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart);
+    $now = time;
+
     if ($timediff{'versions'} == -1) {
-        $timediff{'versions'} = time;
+        $starttime = 0;
+    } else {
+        $starttime = $now - $timediff{'versions'};
     }
-    my $starttime = $now - $timediff{'versions'};
 
     if ($timediff{'newroles'} == -1) {
-        $timediff{'newroles'} = time;
+        $activatedstart = 0;
+    } else {
+        $activatedstart = $now - $timediff{'newroles'};
     }
-    my $activatedstart = $now - $timediff{'newroles'};
 
     if ($timediff{'oldroles'} == -1) {
-        $timediff{'oldroles'} = time;
+        $expiredstart = 0;
+    } else {
+        $expiredstart = $now - $timediff{'oldroles'};
     }
-    my $expiredstart = $now - $timediff{'oldroles'};
 
     if ($timediff{'crslogin'} == -1) {
-        $timediff{'crslogin'} = time;
+        $crsloginstart = 0;
+    } else {
+        $crsloginstart = $now - $timediff{'crslogin'};
     }
 
-    my $crsloginstart = $now - $timediff{'crslogin'};
-
     my $countunread = $display_settings{$cid.':countunread'};
     unless (defined($countunread)) {
         $countunread = 'on';
@@ -1335,28 +1345,26 @@ sub getactivated {
     my (%stucounted,%advcounted);
     my $activatedcount = 0;
     if (keys(%changes) > 0) {
-        foreach my $chg (sort { $b <=> $a } (keys(%changes))) {
+        foreach my $chg (keys(%changes)) {
             if (ref($changes{$chg}) eq 'HASH') {
-                my $timestamp = $changes{$chg}{'exe_time'};
-                if ($timestamp) {
-                    if ($rolechgtime > 0) {
-                        if ($timestamp < $rolechgtime) {
-                            last;
-                        }
-                    }
+                next if ($changes{$chg}{'delflag'});
+                if ($rolechgtime > 0) {
+                    next if ($changes{$chg}{'exe_time'} < $rolechgtime);
+                }
+                if ($changes{$chg}{'exe_time'}) {
+                    my $timestamp = $changes{$chg}{'exe_time'};
                     if (ref($changes{$chg}{'logentry'}) eq 'HASH') {
-                        next if ($changes{$chg}{'delflag'});
-                        my $start = $changes{$chg}{'logentry'}{'start'};
                         my $end = $changes{$chg}{'logentry'}{'end'};
-                        my $section = $changes{$chg}{'logentry'}{'section'};
-                        my $role = $changes{$chg}{'logentry'}{'role'};
-                        my $uname = $changes{$chg}{'uname'};
-                        my $udom = $changes{$chg}{'udom'};
                         next if ($end && $end <= $now);
+                        my $start = $changes{$chg}{'logentry'}{'start'};
+                        next if ($start >= $timestamp);
+                        my $section = $changes{$chg}{'logentry'}{'section'};
                         if (($viewablesec ne '') && ($section ne '')) {
                             next if ($viewablesec ne $section);
                         }
-                        next if ($start >= $timestamp);
+                        my $role = $changes{$chg}{'logentry'}{'role'};
+                        my $uname = $changes{$chg}{'uname'};
+                        my $udom = $changes{$chg}{'udom'};
                         if ($role eq 'st') {
                             $stucounted{$uname.':'.$udom.':'.$section} = $start.':'.$end;
                         } else {
@@ -1663,12 +1671,9 @@ sub display_abovethreshold {
     );
     if (@{$warnings} > 0) {
         @{$warnings} = sort { &cmp_title($a,$b,$res_title) } @{$warnings};
-        $r->print('<form name="reset_tracking" method="post" action="/adm/whatsnew">'.
-                ' <input type="hidden" name="command" value="reset" />'."\n".
-                ' <input type="hidden" name="refpage" value="'.$refpage.'" />'.
-                "\n");
         $r->print('<tr class="LC_info_row">'.
-		  '<td class="LC_left_item">'.$lt{'reso'}.'</td>'.
+		  '<td class="LC_left_item">'.$lt{'reso'}.
+                  '<input type="hidden" name="command" value="" /></td>'.
 		  '<td>'.$lt{'part'}.'</td><td>'.$lt{'nust'}.'</td>'.
 		  '<td>'.$lt{'avat'}.'</td><td>'.$lt{'dedi'}.'</td>'.
 		  '<td>'.$lt{'lare'}.'</td><td  class="LC_right_item">'.
@@ -1704,7 +1709,7 @@ sub display_abovethreshold {
                 }
             }
         }
-        $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="submit" name="counters" value="'.$lt{'rese'}.'" /></td></tr></form>');
+        $r->print('<tr class="LC_info_row"><td colspan="7" class="LC_right_item"><br /><input type="button" name="counters" value="'.$lt{'rese'}.'" onclick="javascript:thresholdreset();" /></td></tr>');
     } elsif ($itemserror) {
         $r->print('<tr class="LC_empty_row"><td>'.$itemserror.'</td></tr>');
     } else {
@@ -1921,7 +1926,7 @@ sub display_coursediscussion {
             my $forum_title = $$unread{$ressymb}{'title'};
             my $type = 'Resource';
             my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
-            my $disclink = $feedurl.'?symb='.$$unread{$ressymb}{symb};
+            my $disclink = $feedurl.'?symb='.&escape($$unread{$ressymb}{symb});
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Discussion Board';
             }