--- loncom/interface/lonwhatsnew.pm	2021/01/01 15:29:14	1.105.2.19
+++ loncom/interface/lonwhatsnew.pm	2017/05/19 18:23:19	1.123
@@ -1,7 +1,5 @@
-# The LearningOnline Network
-# What's New in a course
 #
-# $Id: lonwhatsnew.pm,v 1.105.2.19 2021/01/01 15:29:14 raeburn Exp $
+# $Id: lonwhatsnew.pm,v 1.123 2017/05/19 18:23:19 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,7 +80,7 @@ sub handler {
     }
     unless ($isadhoc) {
         %checkallowed = ( coursenormalmail => 1,
-                          coursecritmail => 1,);
+			  coursecritmail => 1,);
     }
     foreach my $perm_check (['whn','whatsnew',1],
 			    ['pch','coursediscussion',1],
@@ -93,7 +91,6 @@ sub handler {
                             ['vcl','newroles',1],
                             ['vcl','oldroles',1],
                             ['whn','crslogin',1],
-                            ['vcl','sessions',1],
                             ['mgr','resetcounters',1],
 			    ) {
 	my ($perm,$key,$check_section) = @{ $perm_check };
@@ -173,13 +170,6 @@ sub handler {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Intervals'
              ));
-    } elsif ($command eq 'chgsessionlimit' && $checkallowed{'sessions'}) {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>'/adm/whatsnew?command=chgsessionlimit&refpage='.$refpage,
-              text=>"Change session range"});
-        $r->print(&Apache::lonhtmlcommon::breadcrumbs
-            ("What's New?",#'Course_Action_Items_Sessions'
-             ));
     } else {
         $r->print(&Apache::lonhtmlcommon::breadcrumbs
             ("What's New?",#'Course_Action_Items_Display'
@@ -231,19 +221,11 @@ sub display_main_box {
                    604800 => 'last logins for users in last 7 days',
                     86400 => 'last logins for users in last 24 hours',
                    );
-    my %sessions = (
-                     300  => 'course sessions active in the last 5 minutes',
-                     600  => 'course sessions active in the last 10 minutes',
-                     1800 => 'course sessions active in the last 30 minutes',
-                     7200 => 'course sessions active in the last 2 hours',
-                    -7200 => 'course sessions with last activity more than 2 hours ago',
-                   );
     my %interval_titles = (
         versions => \%versions,
         newroles => \%newroles,
         oldroles => \%oldroles,
         crslogin => \%crslogins,
-        sessions => \%sessions,
     );
     my %initpage = &Apache::lonlocal::texthash (
                      firstres => "first resource in the $lctype",
@@ -272,9 +254,6 @@ sub display_main_box {
     } elsif (($command eq 'chgcrslogininterval')
              && $checkallowed->{'crslogin'}) {
         &display_interval_config($r,$refpage,\%interval_titles,'crslogin');
-    } elsif (($command eq 'chgsessionlimit')
-             && $checkallowed->{'sessions'}) {
-        &display_interval_config($r,$refpage,\%interval_titles,'sessions');
     } else {
         &display_actions_box($r,$command,$refpage,\%threshold_titles,
                         \%interval_titles,\%initpage,$cdom,$crs,$checkallowed);
@@ -319,8 +298,7 @@ END
                             "\n";
             }
         }
-        $scripttag.=<<"ENDTOGG";
-    document.visible.submit();
+        $scripttag.='document.visible.submit();
 }
 
 function thresholdreset() {
@@ -328,45 +306,45 @@ function thresholdreset() {
     document.visible.submit();
 }
 
-function toggledetails(prefix) {
-    var total = document.visible[prefix+'count'].value;
-    var sumrow = document.visible[prefix+'row'].value;
+function togglelogins() {
+    var total = document.visible.logincount.value;
+    var sumrow = document.visible.loginrow.value;
     if (total == 0) {
         return;
     }
-    var showdetails = 0;
-    for (var i=0; i<document.visible[prefix+'details'].length; i++) {
-        if (document.visible[prefix+'details'][i].checked) {
-            showdetails = document.visible[prefix+'details'][i].value;
+    var showlogindetails = 0;
+    for (var i=0; i<document.visible.logindetails.length; i++) {
+        if (document.visible.logindetails[i].checked) {
+            showlogindetails = document.visible.logindetails[i].value;
         }
     }
     var detval = "none";
     var sumval = "";
-    if (showdetails == 1) {
+    if (showlogindetails == 1) {
         detval = "";
         sumval = "none";
     }
     for (var j=0; j<total; j++) {
         var counter = j+1;
-        var itemid = prefix+"det_"+counter;
+        var itemid = "logindet_"+counter;
         personele = document.getElementById(itemid);
         if (personele != null) {
             personele.style.display = detval;
         }
     }
-    var detheaderele = document.getElementById(prefix+"titledet");
+    var detheaderele = document.getElementById("logintitledet");
     if (detheaderele != null) {
         detheaderele.style.display = detval;
     }
     for (var k=0; k<sumrow; k++) {
         var counter = k+1;
-        var itemid = prefix+"sum_"+counter;
-        catele = document.getElementById(itemid);
-        if (catele != null) {
-            catele.style.display = sumval;
+        var itemid = "loginsum_"+counter;
+        logincatele = document.getElementById(itemid);
+        if (logincatele != null) {
+            logincatele.style.display = sumval;
         }
     }
-    var sumheaderele = document.getElementById(prefix+"titlesum");
+    var sumheaderele = document.getElementById("logintitlesum");
     if (sumheaderele != null) {
         sumheaderele.style.display = sumval;
     }
@@ -374,7 +352,7 @@ function toggledetails(prefix) {
 }
 // ]]>
 </script>
-ENDTOGG
+';
     }
     my $course_type=&Apache::loncommon::course_type();
     return &Apache::loncommon::start_page("What's New?",
@@ -426,8 +404,6 @@ sub display_actions_box {
     my %activated;
     my %loggedin;
     my $logincount;
-    my %sessions;
-    my $sessioncount;
     my %res_title = ();
     my %show = ();
     my $needitems = 0;
@@ -572,22 +548,6 @@ sub display_actions_box {
         $headings{'crslogin'} = &mt('Last login for users in last 24 hours');
     }
 
-    $timediff{'sessions'} = $display_settings{$cid.':sessionactivity'};
-    unless (defined($timediff{'sessions'})) { $timediff{'sessions'} = 7200; }
-    $interval{'sessions'} = $interval_titles->{'sessions'}->{$timediff{'sessions'}};
-
-    if ($timediff{'sessions'} == -7200) {
-        $headings{'sessions'} = &mt('Session with activity more than 2 hours ago');
-    } elsif ($timediff{'sessions'} == 7200) {
-        $headings{'sessions'} = &mt('Session with activity in last 2 hours');
-    } elsif ($timediff{'sessions'} == 1800) {
-        $headings{'sessions'} = &mt('Session with activity in last 30 minutes');
-    } elsif ($timediff{'sessions'} == 600) {
-        $headings{'sessions'} = &mt('Session with activity in last 10 minutes');
-    } elsif ($timediff{'sessions'} == 300) {
-        $headings{'sessions'} = &mt('Session with activity in last 5 minutes');
-    }
-
     my ($now,$starttime,$activatedstart,$expiredstart,$crsloginstart);
     $now = time;
 
@@ -628,7 +588,7 @@ sub display_actions_box {
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
 	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin','sessions');
+    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles','crslogin');
     my %actioncolumn = (
                          handgrading      => 'left',
                          haserrors        => 'left',
@@ -640,7 +600,6 @@ sub display_actions_box {
                          newroles         => 'right',
                          oldroles         => 'right',
                          crslogin         => 'right',
-                         sessions         => 'right',
                        );
 
     foreach my $key (keys(%{$checkallowed})) {
@@ -655,8 +614,7 @@ sub display_actions_box {
 
     foreach my $item (@actionorder) {
         unless ($item eq 'coursenormalmail' || $item eq 'coursecritmail' ||
-                $item eq 'newroles' || $item eq 'oldroles' || 
-                $item eq 'crslogin' || $item eq 'sessions') {
+                $item eq 'newroles' || $item eq 'oldroles') {
             if ($show{$item}) {
                 $needitems = 1;
                 last;
@@ -669,7 +627,7 @@ sub display_actions_box {
         $itemserror = &getitems(\%unread,\%ungraded,\%bombed,\%triggered,\%changed,\@newdiscussions,\@tograde,\@bombs,\@warnings,\%threshold,$cdom,$crs,\%res_title,\%show,$starttime,$countunread,$checkallowed);
     }
     my $classlist;
-    if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'} || $show{'sessions'}) {
+    if ($show{'oldroles'} || $show{'newroles'} || $show{'crslogin'}) {
         $classlist = &Apache::loncoursedata::get_classlist();
     }
     if ($show{'coursenormalmail'}) {
@@ -687,9 +645,6 @@ sub display_actions_box {
     if ($show{'crslogin'}) {
         $logincount = &getloggedin($cdom,$crs,\%loggedin,$crsloginstart);
     }
-    if ($show{'sessions'}) {
-        $sessioncount = &getsessions($cdom,$crs,\%sessions,$timediff{'sessions'},$classlist);
-    }
     $r->print(qq|<a href="javascript:changeAll('hide');">$lt{'hial'}</a>
      &nbsp;&nbsp;<a href="javascript:changeAll('show');">$lt{'shal'}</a>
      <form method="post" name="visible" action="/adm/whatsnew">\n|);
@@ -719,7 +674,7 @@ sub display_actions_box {
                 $r->print('</td><td>&nbsp;</td><td class="LC_right_col" >');
                 $currcolumn = 'right'; 
             }
-            &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount,\%sessions,$sessioncount,$classlist);
+            &display_launcher($r,$actionitem,$refpage,$checkallowed,\%show,\%headings,\%res_title,\@tograde,\%ungraded,\@bombs,\%bombed,\%changed,\@warnings,\%triggered,\@newdiscussions,\%unread,$msgcount,\@newmsgs,$critmsgcount,\@critmsgs,\%interval,$countunread,\%expired,$expirecount,\%activated,$activecount,$crstype,$itemserror,\%loggedin,$logincount,$classlist);
             $displayed ++; 
         }
     }
@@ -800,8 +755,6 @@ sub display_interval_config {
         $setting = 'oldroleinterval';
     } elsif ($context eq 'newroles') {
         $setting = 'newroleinterval'; 
-    } elsif ($context eq 'sessions') {
-        $setting = 'sessionactivity';
     }
     my $lctype = lc(&Apache::loncommon::course_type());
     my $current = &get_current($env{'user.name'},$env{'user.domain'},
@@ -812,8 +765,6 @@ sub display_interval_config {
         $r->print('<br />'.&mt('Choose the time window to use to display roles for which access to the '.$lctype.' became available.').'<br />');
     } elsif ($context eq 'crslogin') {
         $r->print('<br />'.&mt('Choose the time window to use to display the last login by a user in the '.$lctype).'<br />');
-    } elsif ($context eq 'sessions') {
-        $r->print('<br />'.&mt('Choose the time limit to use to display active user sessions in the '.$lctype.'.').'<br />');
     } else {
         $r->print('<br />'.&mt('Choose the time window to use to display resources in the '.$lctype.' with version changes.').'<br />');
     }
@@ -834,14 +785,7 @@ sub display_interval_config {
 ');
     if (ref($interval_titles) eq 'HASH') {
         if (ref($interval_titles->{$context}) eq 'HASH') {
-            my @sorted;
-            if ($context eq 'sessions') {
-                @sorted = sort { $a <=> $b } (keys(%{$interval_titles->{$context}}));
-                push(@sorted,shift(@sorted));
-            } else {
-                @sorted = reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})));
-            }
-            foreach my $key (@sorted) {
+            foreach my $key (reverse sort ({$a cmp $b} (keys(%{$interval_titles->{$context}})))) {
                 $r->print('<option value="'.$key.'">'.&mt($interval_titles->{$context}->{$key}).
                           '</option>'."\n");
             }
@@ -986,8 +930,7 @@ sub display_launcher {
         $tograde,$ungraded,$bombs,$bombed,$changed,$warnings,$triggered,
         $newdiscussions,$unread,$msgcount,$newmsgs,$critmsgcount,$critmsgs,
         $interval,$countunread,$expired,$expirecount,$activated,$activecount,
-        $crstype,$itemserror,$loggedin,$logincount,$sessions,$sessioncount,
-        $classlist) = @_;
+        $crstype,$itemserror,$loggedin,$logincount,$classlist) = @_;
 
     if ($$checkallowed{$action}) {
         &start_box($r,$show,$headings,$action,$refpage);
@@ -1015,11 +958,8 @@ sub display_launcher {
                 &display_rolechanges($r,$expirecount,$expired,$interval->{'oldroles'},
                                      $crstype,$classlist);
             } elsif ($action eq 'crslogin') { #LAST LOGIN
-                &display_activity($r,'logins',$logincount,$loggedin,$interval->{'crslogin'},
+                &display_crslogins($r,$logincount,$loggedin,$interval->{'crslogin'},
                                    $crstype,$classlist);
-            } elsif ($action eq 'sessions') { #ACTIVE SESSIONS
-                &display_activity($r,'sessions',$sessioncount,$sessions,$interval->{'sessions'},
-                                  $crstype,$classlist);
             }
         }
         &end_box($r);
@@ -1093,6 +1033,7 @@ sub getitems {
 			      $triggered,$threshold,$warnings,
                               $checkallowed);
         }
+
     }
     return; 
 }
@@ -1123,28 +1064,12 @@ sub check_discussions {
 sub check_handgraded {
     my ($resource,$symb,$title,$cdom,$cnum,$ungraded,$tograde) = @_;
     if ($resource->is_problem()) {
-        my ($handgradeable,$is_task);
+        my ($map,$ind,$url)=&Apache::lonnet::decode_symb($symb);
         my $partlist=$resource->parts();
-        if ($resource->is_task()) {
-            $is_task = 1;
-            foreach my $part (@$partlist) {
-                if ($resource->handgrade($part) eq 'yes') {
-                    $handgradeable=1;
-                    last;
-                }
-            }
-        } else {
-            foreach my $part (@$partlist) {
-                my @types = $resource->responseType($part);
-                if (grep(/^essay$/,@types)) {
-                    $handgradeable=1;
-                    last;
-                } elsif (grep(/^custom$/,@types)) {
-                    if ($resource->handgrade($part) eq 'yes') {
-                        $handgradeable=1;
-                        last;
-                    }
-                }
+        my $handgradeable;
+        foreach my $part (@$partlist) {
+            if ($resource->handgrade($part) eq 'yes') {
+                $handgradeable=1; last;
             }
         }
         if ($handgradeable) {
@@ -1153,7 +1078,6 @@ sub check_handgraded {
             if (@ungraded > 0) {
                 $$ungraded{$symb}{count} = scalar(@ungraded);
                 $$ungraded{$symb}{title} = $title;
-                $$ungraded{$symb}{is_task} = $is_task;
                 if ($resource->encrypted()) {
                     $$ungraded{$symb}{'enclink'} = $resource->link();
                     $$ungraded{$symb}{'encsymb'} = $resource->shown_symb();
@@ -1401,20 +1325,19 @@ sub getnormalmail {
             if ($emailstatus{$msgid} eq 'new') {
                 $skipstatus = 1;
             }
-            my $esc_msgid = &escape($msgid);
             my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-                &Apache::lonmsg::unpackmsgid($esc_msgid,undef,$skipstatus,undef,
+                &Apache::lonmsg::unpackmsgid($msgid,undef,$skipstatus,undef,
                                              $env{'request.course.id'});
             if (($fromcid) && ($fromcid eq $env{'request.course.id'})) {
                 if (defined($sendtime) && $sendtime!~/error/) {
                     if (($emailstatus{$msgid} eq 'new') || ($status eq 'new')) {
                         $sendtime = &Apache::lonlocal::locallocaltime($sendtime);
-                        $msgcount ++;
+		        $msgcount ++;
                         if ($shortsubj eq '') {
                             $shortsubj = &mt('No subject');
                         }
                         push(@{$newmsgs}, {
-                            msgid    => $esc_msgid,
+                            msgid    => $msgid,
                             sendtime => $sendtime,
                             shortsub => $shortsubj,
                             from     => $fromname,
@@ -1435,9 +1358,8 @@ sub getcritmail {
     my $result = '';
     my $critmsgcount = 0;
     foreach my $msgid (sort(keys(%what))) {
-        my $esc_msgid = &escape($msgid);
         my ($sendtime,$shortsubj,$fromname,$fromdom,$status,$fromcid)=
-            &Apache::lonmsg::unpackmsgid($esc_msgid,undef,1,undef,
+            &Apache::lonmsg::unpackmsgid($msgid,undef,1,undef,
                                          $env{'request.course.id'});
         if (($fromcid) && ($fromcid eq  $env{'request.course.id'})) {
             if (defined($sendtime) && $sendtime!~/error/) {
@@ -1447,7 +1369,7 @@ sub getcritmail {
                     $shortsubj = &mt('No subject');
                 }
                 push(@{$critmsgs}, {
-                        msgid    => $esc_msgid,
+                        msgid    => $msgid,
                         sendtime => $sendtime,
                         shortsub => $shortsubj,
                         from     => $fromname,
@@ -1692,78 +1614,6 @@ sub getloggedin {
     return $logincount;
 }
 
-sub getsessions {
-    my ($cdom,$cnum,$sessions,$lastactive,$classlist) = @_;
-    my $context = 'course';
-    my ($permission,$allowed) =
-        &Apache::lonuserutils::get_permission($context);
-    my %crs_sessions = &Apache::lonnet::get_course_sessions($cnum,$cdom,$lastactive);
-    my $sessioncount = 0;
-    if (keys(%crs_sessions) > 0) {
-        if (ref($classlist) eq 'HASH') {
-            my $viewablesec = &Apache::lonuserutils::viewable_section($permission);
-            my $secidx = &Apache::loncoursedata::CL_SECTION();
-            my %coursepersonnel=&Apache::lonnet::get_course_adv_roles($cdom.'_'.$cnum,1);
-            my %personnel;
-            foreach my $role (sort(keys(%coursepersonnel))) {
-                my ($rolecode,$section);
-                if ($role =~ /:/) {
-                    ($rolecode,$section) = split(/:/,$role);
-                } else {
-                    $rolecode = $role;
-                }
-                if ($viewablesec ne '') {
-                    next if ($viewablesec ne $section);
-                }
-                foreach my $user (split(/\,/,$coursepersonnel{$role})) {
-                    push(@{$personnel{$user}{$rolecode}},$section);
-                }
-            }
-            foreach my $key (keys(%crs_sessions)) {
-                if (exists($classlist->{$key})) {
-                    my $student = $classlist->{$key};
-                    my $section = $student->[$secidx];
-                    my $lastaccess = $crs_sessions{$key};
-                    if ($viewablesec ne '') {
-                        next if ($viewablesec ne $section);
-                    }
-                    my ($stuname,$studom) = split(/:/,$key);
-                    my %info = (
-                                 'section' => $section,
-                                 'role'    => 'st',
-                                 'uname'   => $stuname,
-                                 'udom'    => $studom,
-                    );
-                    $sessioncount ++;
-                    push(@{$sessions->{$lastaccess}},\%info);
-                } elsif (exists($personnel{$key})) {
-                    my $lastaccess = $crs_sessions{$key};
-                    my ($uname,$udom) = split(/:/,$key);
-                    if (ref($personnel{$key}) eq 'HASH') {
-                        my ($showrole,$showsec);
-                        foreach my $possrole ('cc','co','in','ta','ep','ad','st') {
-                            if (exists($personnel{$key}{$possrole})) {
-                                $showrole = $possrole;
-                                $showsec = join(', ',@{$personnel{$key}{$possrole}});
-                                last;
-                            }
-                        }
-                        my %info = (
-                                     'section' => $showsec,
-                                     'role'    => $showrole,
-                                     'uname'   => $uname,
-                                     'udom'    => $udom,
-                        );
-                        $sessioncount ++;
-                        push(@{$sessions->{$lastaccess}},\%info);
-                    }
-                }
-            }
-        }
-    }
-    return $sessioncount;
-}
-
 sub checkversions {
     my ($cdom,$crs,$navmap,$changed,$starttime) = @_;
     my %changes=&Apache::lonnet::dump('versionupdate',$cdom,$crs);
@@ -1819,24 +1669,13 @@ sub display_handgrade {
         foreach my $res (@{$tograde}) {
             $rowNum ++;
             my $css_class = $rowNum%2?' class="LC_odd_row"':'';
-            my $linkurl;
-            if ($$ungraded{$res}{'is_task'}) {
-                my ($map,$id,$url)=&Apache::lonnet::decode_symb($res);
-                $linkurl=&Apache::lonnet::clutter($url);
-                $linkurl .= '?symb='.&escape($res);
-                if ($$ungraded{$res}{'enclink'}) {
-                    $linkurl =
-                        $$ungraded{$res}{'enclink'}.'?symb='.$$ungraded{$res}{'encsymb'};
-                }
+            my $linkurl='/adm/grades';
+            if ($$ungraded{$res}{'enclink'}) {
+                $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
             } else {
-                $linkurl='/adm/grades';
-                if ($$ungraded{$res}{'enclink'}) {
-                    $linkurl.='?symb='.$$ungraded{$res}{'encsymb'};
-                } else {
-                    $linkurl.='?symb='.&escape($res);
-                }
-                $linkurl.='&amp;command=ungraded';
+                $linkurl.='?symb='.&escape($res);
             }
+            $linkurl.='&amp;command=ungraded';
             $r->print('<tr'.$css_class.'><td><a href="'.$linkurl.'">'.$$ungraded{$res}{title}.'</a></td><td class="LC_right_item">'.$$ungraded{$res}{count}.'</td></tr>');
         }
     } elsif ($itemserror) {
@@ -2041,8 +1880,8 @@ sub display_rolechanges {
     return;
 }
 
-sub display_activity {
-    my ($r,$context,$count,$details,$interval,$crstype,$classlist) = @_;
+sub display_crslogins {
+    my ($r,$logincount,$loggedin,$interval,$crstype,$classlist) = @_;
     return unless (ref($classlist) eq 'HASH');
     my %lt = &Apache::lonlocal::texthash(
         'user'   => 'User',
@@ -2050,38 +1889,29 @@ sub display_activity {
         'sec'    => 'Section',
         'number' => 'Total number of logins',
     );
-    my $prefix = 'login';
-    if ($context eq 'sessions') {
-        $lt{'number'} = &mt('Total number of active user sessions');
-        $lt{'active'} = &mt('Last active');
-        $prefix = 'session';
-    }
-    if ($count) {
+    if ($logincount) {
 
-        my $hdr = '<tr class="LC_info_row" style="display:none" id="'.$prefix.'titledet">'.
+        my $hdr = '<tr class="LC_info_row" style="display:none" id="logintitledet">'.
                   '<td class="LC_left_item">'.$lt{'user'}.'</td>'.
                   '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
-                  '<td class="LC_left_item">'.$lt{'sec'}.'</td>';
-        if ($context eq 'sessions') {
-            $hdr .= '<td class="LC_left_item">'.$lt{'active'}.'</td>';
-        }
-        $hdr .= '</tr>'."\n".
-                '<tr class="LC_info_row" id="'.$prefix.'titlesum">'.
-                '<td class="LC_left_item">'.$lt{'number'}.'</td>'.
-                '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
-                '<td class="LC_left_item">'.$lt{'sec'};
+                  '<td class="LC_left_item">'.$lt{'sec'}.'</td></tr>'.
+                  '<tr class="LC_info_row" id="logintitlesum">'.
+                  '<td class="LC_left_item">'.$lt{'number'}.'</td>'.
+                  '<td class="LC_left_item">'.$lt{'role'}.'</td>'.
+                  '<td class="LC_left_item">'.$lt{'sec'};
         my (%bylastname,%counts);
-        if (ref($details) eq 'HASH') {
-            my @items = sort { $b <=> $a } (keys(%{$details}));
-            my $num = 0;
+        if (ref($loggedin) eq 'HASH') {
+            my @logins = sort { $b <=> $a } (keys(%{$loggedin}));
+            my $numlogin = 0;
             my $fullnameidx = &Apache::loncoursedata::CL_FULLNAME();
-            foreach my $item (@items) {
-                if (ref($details->{$item}) eq 'ARRAY') {
-                    foreach my $user (@{$details->{$item}}) {
+            foreach my $item (@logins) {
+                if (ref($loggedin->{$item}) eq 'ARRAY') {
+                    foreach my $user (@{$loggedin->{$item}}) {
                         if (ref($user) eq 'HASH') {
                             my $section;
                             my $role =
                                 &Apache::lonnet::plaintext($user->{'role'},$crstype);
+                            my $status = &mt($user->{'status'});
                             if ($user->{'section'} eq '') {
                                 $section = &mt('none');
                             } else {
@@ -2098,13 +1928,10 @@ sub display_activity {
                             }
                             my $link =
                                 &Apache::loncommon::aboutmewrapper($fullname,$uname,$udom);
-                            my $entry = '<td>'.$link.'</td>'.
-                                        '<td>'.$role.'</td>'.
-                                        '<td>'.$section.'</td>';
-                            if ($context eq 'sessions') {
-                                $entry .= '<td>'.&Apache::lonlocal::locallocaltime($item).'</td>';
-                            }
-                            push(@{$bylastname{$fullname}},$entry);
+                            push(@{$bylastname{$fullname}},
+                                                          '<td>'.$link.'</td>'.
+                                                          '<td>'.$role.'</td>'.
+                                                          '<td>'.$section.'</td>');
                         }
                     }
                 }
@@ -2113,9 +1940,9 @@ sub display_activity {
             foreach my $person (sort(keys(%bylastname))) {
                 if (ref($bylastname{$person}) eq 'ARRAY') {
                     foreach my $item (@{$bylastname{$person}}) {
-                        $num ++;
-                        my $css_class = $num%2?' class="LC_odd_row"':'';
-                        $table .= '<tr'.$css_class.' style="display:none;"  id="'.$prefix.'det_'.$num.'">'.$item.'</tr>';
+                        $numlogin ++;
+                        my $css_class = $numlogin%2?' class="LC_odd_row"':'';
+                        $table .= '<tr'.$css_class.' style="display:none;"  id="logindet_'.$numlogin.'">'.$item.'</tr>';
                     }
                 }
             }
@@ -2126,21 +1953,21 @@ sub display_activity {
                     foreach my $sec (sort { $b <=> $a } (keys(%{$counts{$role}}))) {
                         $numrow ++;
                         my $css_class = $numrow%2?' class="LC_odd_row"':'';
-                        $table .= '<tr '.$css_class.' id="'.$prefix.'sum_'.$numrow.'">'.
+                        $table .= '<tr '.$css_class.' id="loginsum_'.$numrow.'">'.
                                   '<td>'.$counts{$role}{$sec}.'</td>'.
                                   '<td>'.$showrole.'</td>'.
                                   '<td>'.$sec.'</td></tr>';
                    }
                 }
             }
-            $r->print($hdr.'<input type="hidden" name="'.$prefix.'count" value="'.$num.
-                      '" /><input type="hidden" name="'.$prefix.'row" value="'.$numrow.
+            $r->print($hdr.'<input type="hidden" name="logincount" value="'.$numlogin.
+                      '" /><input type="hidden" name="loginrow" value="'.$numrow.
                       '" /></td></tr>'.$table);
         }
     } else {
         $r->print('<tr class="LC_empty_row"><td>'.
                   &mt('There are no '.$interval).
-                  '<input type="hidden" name="'.$prefix.'count" value="'.$count.
+                  '<input type="hidden" name="logincount" value="'.$logincount.
                   '." /></td></tr>');
     }
     return;
@@ -2175,7 +2002,7 @@ sub display_coursediscussion {
             my $forum_title = $$unread{$ressymb}{'title'};
             my $type = 'Resource';
             my $feedurl=&Apache::lonfeedback::get_feedurl($ressymb);
-            my $disclink = $feedurl.'?symb='.&escape($$unread{$ressymb}{symb});
+            my $disclink = $feedurl.'?symb='. &escape($$unread{$ressymb}{symb});
             if ($feedurl =~ /bulletinboard/) {
                 $type = 'Discussion Board';
             }
@@ -2308,8 +2135,6 @@ sub store_interval_setting {
             $interval_settings{$cid.':newroleinterval'} = $env{'form.interval'};
         } elsif ($context eq 'crslogin') {
             $interval_settings{$cid.':crslogininterval'} = $env{'form.interval'};
-        } elsif ($context eq 'sessions') {
-            $interval_settings{$cid.':sessionactivity'} = $env{'form.interval'};
         } else {
             $interval_settings{$cid.':interval'} = $env{'form.interval'};
         }
@@ -2468,17 +2293,11 @@ sub start_box {
         if ($$show{$caller}) {
             $r->print('
               <tr>
-                <td class="LC_subheader" align="left"><span class="LC_nobreak"><label><input type="radio" name="logindetails" value="0" checked="checked" onclick="javascript:toggledetails('."'login'".');" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:toggledetails('."'login'".');" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
-              </tr>');
-        }
-    } elsif (($caller eq 'sessions') && ($$show{$caller})) {
-        if ($$show{$caller}) {
-            $r->print('
-              <tr>
-                <td class="LC_subheader" align="left"><span class="LC_nobreak"><label><input type="radio" name="sessiondetails" value="0" checked="checked" onclick="javascript:toggledetails('."'session'".');" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="sessiondetails" value="1" onclick="javascript:toggledetails('."'session'".');" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgsessionlimit&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+                <td class="LC_subheader" align="left"><span class="LC_nobreak"><label><input type="radio" name="logindetails" value="0" checked="checked" onclick="javascript:togglelogins();" />&nbsp;'.&mt('Summary').'</label><label><input type="radio" name="logindetails" value="1" onclick="javascript:togglelogins();" />&nbsp;'.&mt('Details').'</label></span></td><td class="LC_subheader"><a href="/adm/whatsnew?command=chgcrslogininterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
         }
     }
+
     $r->print('
               <tr>
                <td colspan="2">