--- loncom/interface/lonmsgdisplay.pm	2019/08/06 17:53:56	1.181.2.2
+++ loncom/interface/lonmsgdisplay.pm	2015/06/18 20:19:06	1.182
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines for messaging display
 #
-# $Id: lonmsgdisplay.pm,v 1.181.2.2 2019/08/06 17:53:56 raeburn Exp $
+# $Id: lonmsgdisplay.pm,v 1.182 2015/06/18 20:19:06 musolffc Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -102,8 +102,6 @@ use HTML::TokeParser();
 use Apache::Constants qw(:common);
 use Apache::loncommon();
 use Apache::lonhtmlcommon();
-use Apache::longroup;
-use Apache::lonnavmaps;
 use Apache::lontexconvert();
 use HTML::Entities();
 use Apache::lonlocal;
@@ -775,24 +773,14 @@ sub groupmail_header {
               text=>"Groups",
               title=>$brtitle});
     }
-    my $view_permission =
-          &Apache::lonnet::allowed('vcg',$env{'request.course.id'}.($env{'request.course.sec'}?'/'.$env{'request.course.sec'}:''));
-    my $navmap=Apache::lonnavmaps::navmap->new();
-    my $grouppagelink = &Apache::longroup::get_group_link($cdom,$cnum,$group,$navmap,$view_permission,$refarg);
-    if ($grouppagelink) {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({href=>$grouppagelink,
-              text=>"Group: $description",
-              title=>"Go to group's home page"},);
-    } else {
-        &Apache::lonhtmlcommon::add_breadcrumb
-            ({text=>"Group: $description",});
-    }
     &Apache::lonhtmlcommon::add_breadcrumb
-         ({href=>"/adm/email?compose=group&group=".
-                 "$env{'form.group'}&$refarg",
-           text=>"Send a Message in a Group",
-           title=>"Compose Group Message"},);
+        ({href=>"/adm/$cdom/$cnum/$group/smppg?$refarg",
+          text=>"Group: $description",
+          title=>"Go to group's home page"},
+         {href=>"/adm/email?compose=group&group=".
+                "$env{'form.group'}&$refarg",
+          text=>"Send a Message in a Group",
+          title=>"Compose Group Message"},);
     if ($action eq 'sending') {
             &Apache::lonhtmlcommon::add_breadcrumb
                          ({text=>"Messages being sent.",
@@ -1412,11 +1400,14 @@ sub compout {
                                        'to'   => 'To:',
                                       );
     my %attachmax = (
-                     text => &mt('(128 KB max size)'),
-                     num  => 131072,
+                     text => &mt('(1 MB max size)'),
+                     num  => 1048576,
                     );
     if (!$forwarding && !$multiforward) {
-        $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}.': <input type="file" name="attachment" /></td></tr>';
+        $attachrow = '<tr><td colspan="3"><b>'.$lt{'atta'}.'</b> '.$attachmax{'text'}
+            .': <input type="file" name="attachment" class="flUpload" multiple />'
+            .'</td></tr>'
+            .'<input type="hidden" id="free_space" value="'.$attachmax{'num'}.'" />';
     }
     if (&Apache::lonnet::allowed('srm',$env{'request.course.id'})
 	|| &Apache::lonnet::allowed('srm',$env{'request.course.id'}.
@@ -2186,8 +2177,7 @@ sub displaymessage {
     my @actionlist;
     if ($env{'user.adv'}) {
 
-	if (($env{'request.course.id'}) && ($from_student) &&
-            (&Apache::lonnet::allowed('vgr',$env{'request.course.id'}))) {
+	if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) {
 		push(@actionlist,&Apache::loncommon::track_student_link(
                                       'View recent activity'
                                      ,$content{'sendername'}
@@ -2680,6 +2670,8 @@ sub header {
     if ($baseurl) {
 	$extra .= "<base href=\"".&Apache::lonnet::absolute_url()."/$baseurl\" />";
     }
+    $extra .= '<script type="text/javascript"
+                src="/res/adm/includes/file_upload.js"></script>';
     $r->print(&Apache::loncommon::start_page('Messages',
  					$extra));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs