--- loncom/interface/lonmsgdisplay.pm 2008/12/03 21:09:44 1.99 +++ loncom/interface/lonmsgdisplay.pm 2009/07/25 23:16:04 1.128 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Routines for messaging display # -# $Id: lonmsgdisplay.pm,v 1.99 2008/12/03 21:09:44 schafran Exp $ +# $Id: lonmsgdisplay.pm,v 1.128 2009/07/25 23:16:04 raeburn Exp $ # # Copyright Michigan State University Board of Trustees # @@ -136,6 +136,9 @@ sub folderlist { ); + # set se lastvisit for the new mail check in the toplevel menu + &Apache::lonnet::appenv({'user.mailcheck.lastvisit'=>time}); + my %actions = &Apache::lonlocal::texthash( view => 'View Folder', rename => 'Rename Folder', @@ -170,6 +173,7 @@ sub folderlist { $formhash{'select_form_order'} = ['','critical',@userorder,'sent','trash']; my $output = qq||; my %show = ('select_form_order' => [10,20,50,100,200], map {$_=>$_} (10,20,50,100,200)); @@ -236,16 +241,16 @@ function folder_choice(targetform,caller '.$lt{'actn'}.'
'. &Apache::loncommon::select_form('view','folderaction',%actions).'
'. - ' + '      '. - ''. + '

- 		'.&mt('New Folder').'
'. + 		'.&mt('Name').'
'. '
@@ -292,11 +297,11 @@ sub scrollbuttons { } return ''.&mt('Page').': '. - ''. - ''. - ' of '.$maxdis. - ''. - '
'. + ''. + ''. + ' / '.$maxdis.' '. + ''. + '
'. &mt('[_1] messages: showing messages [_2] through [_3] of [_4].',$status,$first,$finish,$total).''; } # =============================================================== Status Change @@ -353,7 +358,7 @@ sub makefolder { } } else { $outcome = - &mt('Error - could not obtain lock on email folders record.'); + &mt('Error - could not obtain lock on message folders record.'); } return ($outcome,$warning); } @@ -519,7 +524,10 @@ sub discourse { \%defaultUsers, 1,"selectedusers",1,'email') ) { - $result .= '
'.&mt('Bcc: course members with current access').'
'; + $result .= '
' + .&mt('Bcc: course members with current access') + .'' + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'active'} = 1; @@ -531,7 +539,10 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { - $result .= '
'.&mt('Bcc: course members with expired access').'
'; + $result .= '
' + .&mt('Bcc: course members with expired access') + .'' + .''; $result .= $tmptext.'

'; if (ref($statushash) eq 'HASH') { $statushash->{'previous'} = 1; @@ -544,7 +555,10 @@ sub discourse { \%defaultUsers, 1, "selectedusers",0,'email') ) { - $result .= '
'.&mt('Bcc: course members with future access').'
'; + $result .= '
' + .&mt('Bcc: course members with future access') + .'' + .''; $result .= $tmptext.'
'; if (ref($statushash) eq 'HASH') { $statushash->{'future'} = 1; @@ -555,17 +569,16 @@ sub discourse { } sub disgroup { - my ($cdom,$cnum,$group,$access_status) = @_; - my $result; + my ($r,$cdom,$cnum,$group,$access_status) = @_; + my $hasfloat; # Needs to be in a course if (!($env{'request.course.fn'})) { - $result = &mt('Error: you must have a course role selected to be able to send a broadcast -e-mail to a group in the course.'); - return $result; + $r->print(''.&mt('Error: you must have a course role selected to be able to send a broadcast message to a group in the course.').''); + return; } if ($cdom eq '' || $cnum eq '') { - $result = &mt('Error: could not determine domain or number of course'); - return $result; + $r->print(''.&mt('Error: could not determine domain or number of course').''); + return; } my ($memberinfo,$numitems) = &Apache::longroup::group_memberlist($cdom,$cnum,$group,{},[]); @@ -578,10 +591,15 @@ e-mail to a group in the course.'); push(@statustypes,('future','previous')); } if (keys(%{$memberinfo}) == 0) { - $result = &mt('As this group has no members, there are no '. - 'recipients to select.'); - return $result; + $r->print(''. + &mt('As this group has no members, there are no recipients to select'). + ''); + return; } else { + $hasfloat = 1; + unless($env{'environment.wysiwygeditor'} eq 'on') { + $r->print('
'); + } my %Sortby = ( active => {}, previous => {}, @@ -607,7 +625,7 @@ e-mail to a group in the course.'); push(@{$Sortby{$status}{$$memberinfo{$user}{fullname}}},$user); } } - $result .= &group_check_uncheck(); + $r->print(&group_check_uncheck()); foreach my $status (@statustypes) { if (ref($numitems) eq 'HASH') { if ((defined($$numitems{$status})) && ($$numitems{$status})) { @@ -615,51 +633,56 @@ e-mail to a group in the course.'); if (ref($access_status) eq 'HASH') { $access_status->{$status} = $$numitems{$status}; } - $result.='
'.$lt{$status}. - '
'. - ''. - ''. - '  '. - ''. - ''; + $r->print('
'. + ''.$lt{$status}.''. + ''. + ''. + ''. + '  '. + ''. + ''); if ($status eq 'active') { - $result .= '   '; + $r->print((' 'x3).''); } - $result .= '
'.&Apache::loncommon::start_data_table(). + $r->print('
'.&Apache::loncommon::start_data_table(). &Apache::loncommon::start_data_table_header_row(). - "$lt{'name'}". - "$lt{'usnm'}". - "$lt{'doma'}". - &Apache::loncommon::end_data_table_header_row(); + "$lt{'name'}". + "$lt{'usnm'}". + "$lt{'doma'}". + &Apache::loncommon::end_data_table_header_row()); foreach my $key (sort(keys(%{$Sortby{$status}}))) { foreach my $user (@{$Sortby{$status}{$key}}) { - $result .= - &Apache::loncommon::start_data_table_row(). - 'print(&Apache::loncommon::start_data_table_row(). + ''. - $$memberinfo{$user}{'fullname'}.''. + $$memberinfo{$user}{'fullname'}.''. ''.$$memberinfo{$user}{'uname'}.''. ''.$$memberinfo{$user}{'udom'}.''. - &Apache::loncommon::end_data_table_row(); + &Apache::loncommon::end_data_table_row()); } } - $result .= &Apache::loncommon::end_data_table().'

'; + $r->print(&Apache::loncommon::end_data_table().''. + '

'); } } } + unless($env{'environment.wysiwygeditor'} eq 'on') { + $r->print('
'); + } } - return $result; + return $hasfloat; } sub group_check_uncheck { my $output = qq| |; } @@ -752,7 +776,7 @@ sub discrit { .'
' .&mt('Access to other pages will be prevented until you have moved all critical messages to your inbox.') .'

' - .'
' + .'' .''; my %what=&Apache::lonnet::dump('critical'); my $result = ''; @@ -831,6 +855,7 @@ sub sortedmessages { } foreach my $msgid (@messages) { + next if ($msgid eq ''); my $esc_msgid=&escape($msgid); my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$fromcid,$processid,$symb,$error) = &Apache::lonmsg::unpackmsgid($esc_msgid,$folder,undef, @@ -970,6 +995,7 @@ sub disfolder { my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(< +// ENDDISHEADER - my $fsqs='&folder='.$folder; + my $fsqs='&folder='.$folder; my @temp=&sortedmessages(\%blocked,$startblock,$endblock,\$numblocked,$folder,$msgstatus); my $totalnumber=$#temp+1; if ($totalnumber < 1) { @@ -1071,11 +1097,13 @@ ENDDISHEADER $r->print("\n"); my $suffix = &Apache::lonmsg::foldersuffix($folder); + my $count = 0; for (my $n=$firstdis;$n<=$lastdis;$n++) { my ($sendtime,$shortsubj,$fromname,$fromdomain,$status,$origID, $description,$recv_name,$recv_domain)= @{$temp[$n]}; if (($status ne 'deleted') && defined($sendtime) && $sendtime!~/error/) { + $count ++; if ($status eq 'new') { $r->print(''); } elsif ($status eq 'read') { @@ -1107,15 +1135,14 @@ ENDDISHEADER } } my $localsenttime = &Apache::lonlocal::locallocaltime($sendtime); - my $count = $n +1; - $r->print(''.(($status eq 'new')?'':''). + $r->print(''.(($status eq 'new')?'':''). $count.'.'.(($status eq 'new')?'':'').' '. ''); + ' value="'.$origID.'" />'); foreach my $item ($localsenttime,$dis_name,$dis_domain,$shortsubj) { $r->print(''.(($status eq 'new')?'':''). ''. - $item.(($status eq 'new')?'':'').''); + $item.(($status eq 'new')?'':'').''); } my $showstatus; my %statushash = &get_msgstatus_types(); @@ -1178,7 +1205,7 @@ ENDDISHEADER '" onclick="javascript:validate_checkedaction()"/>'."\n". ''); my $postedstartdis=$startdis+1; - $r->print(''); + $r->print(''); if ($numblocked > 0) { $r->print(&blocked_in_folder($numblocked,$startblock,$endblock, \%setters)); @@ -1287,7 +1314,7 @@ sub compout { $dispcrit= ''.$crithelp.'  '.&mt('Require return receipt?').'  
'. '
'. +&mt('Send copy to permanent e-mail address (if known)').'
'. '
'; } @@ -1317,22 +1344,24 @@ sub compout { if ($group eq '') { my $studentsel = &discourse(\%access_status); if ($studentsel) { - $r->print('
'.$studentsel.'
'); + if ($env{'environment.wysiwygeditor'} eq 'on') { + $r->print($studentsel); + } else { + $r->print('
'.$studentsel.'
'); + } $hasfloat = 1; } } else { $can_grp_broadcast = &check_group_priv($group); if ($can_grp_broadcast) { - $r->print('
'. - &disgroup($cdom,$cnum,$group,\%access_status). - '
'); - $hasfloat = 1; + $hasfloat = &disgroup($r,$cdom,$cnum,$group,\%access_status); } } if ($hasfloat) { $sendmode = ''."\n"; $broadcast_js = qq| |; @@ -1402,7 +1432,9 @@ function courseRecipients() { my $jscript = &Apache::loncommon::check_uncheck_jscript(); $r->print(<<"ENDREPSCRIPT"); ENDREPSCRIPT } @@ -1412,7 +1444,11 @@ ENDREPSCRIPT if ($env{'form.text'}) { $dismsg=$env{'form.text'}; } if ($env{'form.subject'}) { $dissub=$env{'form.subject'}; } if ($hasfloat) { - $r->print($broadcast_js.'
'); + if ($env{'environment.wysiwygeditor'} eq 'on') { + $r->print($broadcast_js); + } else { + $r->print($broadcast_js.'
'); + } $onsubmit = ' onsubmit="javascript:courseRecipients();" '; } $r->print( @@ -1521,7 +1557,7 @@ ENDREPSCRIPT $r->print(&recipient_input_row($defdom,%lt)); } } - my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(); + my $latexHelp = &Apache::loncommon::helpLatexCheatsheet(undef,undef,1); my $wysiwyglink=&Apache::lonhtmlcommon::htmlareaselectactive('message').'
'; my $subj_size; if ($multiforward) { @@ -1564,7 +1600,7 @@ $wysiwyglink); $r->print(<<"ENDCOMP"); $attachrow
-$latexHelp +$latexHelp
$wysiwyglink $sendmode @@ -1618,7 +1654,9 @@ ENDUPLOAD } $r->print(''); if ($hasfloat) { - $r->print('
'); + unless($env{'environment.wysiwygeditor'} eq 'on') { + $r->print('
'); + } } $r->print(&generate_preview_form); } @@ -1665,10 +1703,10 @@ sub additional_rec_row { my $bcc = &mt('Bcc:'); my $exmpl = &mt('username:domain,username:domain,...'); my $output = <<"ENDADD"; -
$lt->{'ad'} ($exmpl): +
$lt->{'ad'} ($exmpl) -
 $lt->{'to'}
 $cc
 $bcc
+
 $bcc
ENDADD return $output; } @@ -1814,7 +1852,7 @@ $content{'sendername'}.':'. } # Check to see if there were any messages. if ($result eq '') { - my $lctype = lc(&Apache::loncommon::course_type()); + my $lctype = &mt(lc(&Apache::loncommon::course_type())); if ($target ne 'tex') { $r->print("

".&mt('No notes, face-to-face discussion records, critical messages, or broadcast messages in this [_1].',$lctype)."

"); } else { @@ -1848,8 +1886,8 @@ sub facetoface { return; } my $crstype = &Apache::loncommon::course_type(); - my $leaders = ($crstype eq 'Group') ? 'coordinators and leaders' - : 'faculty and staff'; + my $leaders = ($crstype eq 'Community') ? 'coordinators and leaders' + : 'faculty and staff'; &printheader($r, '/adm/email?recordftf=query', "User Notes, Face-to-Face, Critical Messages, Broadcast Messages, Archived Messages"); @@ -1871,21 +1909,23 @@ sub facetoface { 'subm' => 'Retrieve discussion and message records', 'newr' => 'New Record (record is visible to '.lc($crstype).' '.$leaders.')', 'post' => 'Post this Record'); - $r->print(<<"ENDTREC"); -

$lt{'head'}

-
- - - - - - - -
$lt{'user'}: -$stdbrws -
$lt{'dom'}:$domform
-
-ENDTREC + + $r->print('

'.$lt{'head'}.'

' + .'
' + .'' + .&Apache::lonhtmlcommon::start_pick_box() + .&Apache::lonhtmlcommon::row_title($lt{'user'}) + .'' + .' '.$stdbrws + .&Apache::lonhtmlcommon::row_closure() + .&Apache::lonhtmlcommon::row_title($lt{'dom'}) + .$domform + .&Apache::lonhtmlcommon::row_closure(1) + .&Apache::lonhtmlcommon::end_pick_box() + .'
' + .'' + ); + if (($stage ne 'query') && ($env{'form.recdomain'}) && ($env{'form.recuname'})) { chomp($env{'form.newrecord'}); @@ -1894,8 +1934,17 @@ ENDTREC $env{'form.recuname'}, $env{'form.recdomain'}); } - $r->print('

'.&Apache::loncommon::plainname($env{'form.recuname'}, - $env{'form.recdomain'}).'

'); + my $aboutmelink=&Apache::loncommon::aboutmewrapper( + &Apache::loncommon::plainname($env{'form.recuname'} + ,$env{'form.recdomain'}) + ,$env{'form.recuname'},$env{'form.recdomain'}); + $r->print('
' + .'

' + .&mt('Discussion and message records for [_1] ([_2])' + ,$aboutmelink + ,$env{'form.recuname'}.':'.$env{'form.recdomain'}) + .'

' + ); &disfacetoface($r,$env{'form.recuname'},$env{'form.recdomain'}); $r->print(< @@ -1924,8 +1973,8 @@ sub examblock { $r->print('Not allowed'); return; } - my $usertype = (&Apache::loncommon::course_type() eq 'Group') ? 'members' - : 'students'; + my $usertype = (&Apache::loncommon::course_type() eq 'Community') ? 'members' + : 'students'; my %lt=&Apache::lonlocal::texthash( 'comb' => 'Communication Blocking', 'cbds' => 'Communication blocking during scheduled exams', @@ -2134,7 +2183,7 @@ END foreach my $block (@{$typeorder}) { my $blockstatus = ''; if ($blocks->{$block} eq 'on') { - $blockstatus = 'checked="true"'; + $blockstatus = 'checked="checked"'; } $r->print('
'); } @@ -2201,7 +2250,7 @@ END sub blocktype_text { my %types = &Apache::lonlocal::texthash( 'com' => 'Messaging', - 'chat' => 'Chat', + 'chat' => 'Chat Room', 'boards' => 'Discussion', 'port' => 'Portfolio', 'groups' => 'Groups', @@ -2263,64 +2312,96 @@ sub displaymessage { # start output &printheader($r,'/adm/email?display='.&escape($msgid),'Display a Message','',$content{'baseurl'}); my %courseinfo=&Apache::lonnet::coursedescription($content{'courseid'}); -# Functions - $r->print(''); + +# Prepare available functions + my @functionlist; if (!$content{'noreplies'}) { - $r->print(''); - } - $r->print(''. - ''. - ''. - ''); + push(@functionlist,'' + .&mt('Reply') + .''); + } + push(@functionlist,'' + .&mt('Forward') + .''); + push(@functionlist,'' + .&mt('Mark Unread') + .''); + push(@functionlist,'' + .&mt('Delete') + .''); + push(@functionlist,'' + .&mt('Back to Folder Display') + .''); if ($counter > 0){ - $r->print(''); + push(@functionlist,'' + .&mt('Previous') + .''); } if ($counter < $number_of_messages - 1){ - $r->print(''); + push(@functionlist,'' + .&mt('Next') + .''); } - $r->print('
'.&mt('Functions').':'.&mt('Reply').''.&mt('Forward').''.&mt('Mark Unread').''.&mt('Delete').''.&mt('Back to Folder Display').''.&mt('Previous').''.&mt('Next').'
'); + +# Prepare available actions my $symb; if (defined($content{'symb'})) { $symb = $content{'symb'}; } elsif (defined($content{'baseurl'})) { $symb=&Apache::lonnet::symbread($content{'baseurl'}); } + my @actionlist; if ($env{'user.adv'}) { - my $actionlist=''; + if (&Apache::lonnet::allowed('vgr',$env{'request.course.id'})) { - $actionlist.='' - .&Apache::loncommon::track_student_link( - &mt('View recent activity'),$content{'sendername'},$content{'senderdomain'},'check') - .''; + push(@actionlist,&Apache::loncommon::track_student_link( + &mt('View recent activity') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,'check')); } if (&Apache::lonnet::allowed('opa',$env{'request.course.id'}) && $symb) { - $actionlist.='' - .&Apache::loncommon::pprmlink( - &mt('Set/Change parameters'),$content{'sendername'},$content{'senderdomain'},$symb,'check') - .''; + push(@actionlist,&Apache::loncommon::pprmlink( + &mt('Set/Change parameters') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); } if (&Apache::lonnet::allowed('mgr',$env{'request.course.id'}) && $symb) { - $actionlist.='' - .&Apache::loncommon::pgrdlink( - &mt('Set/Change grades'),$content{'sendername'},$content{'senderdomain'},$symb,'check') - .''; - } - if ($actionlist) { - $r->print('' - .'' - .$actionlist - .'
' - .&mt('Currently available actions (will open extra window):') - .'
'); - } + push(@actionlist,&Apache::loncommon::pgrdlink( + &mt('Set/Change grades') + ,$content{'sendername'} + ,$content{'senderdomain'} + ,$symb + ,'check')); + } } + +# Print functionlist and actionlist in page header + my $functions='
'; + + # Functionlist + $functions.=&Apache::lonhtmlcommon::start_funclist(); + foreach my $item (@functionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions .= &Apache::lonhtmlcommon::end_funclist(); + + # Actionlist + if (@actionlist) { + my $legendtext=&mt('Currently available actions (will open extra window)'); + $functions.=&Apache::lonhtmlcommon::start_funclist($legendtext); + foreach my $item (@actionlist) { + $functions.=&Apache::lonhtmlcommon::add_item_funclist($item); + } + $functions.=&Apache::lonhtmlcommon::end_funclist(); + } + + $functions.='
'; + $r->print(&Apache::loncommon::head_subbox($functions)); + + my ($tonum,$tolist,$cclist,$bcclist,$groupcclist,%recipients); if ($content{'recipid'}) { $tonum = &retrieve_recips('display',\%content,\%recipients); @@ -2334,7 +2415,16 @@ sub displaymessage { $bcclist = join(', ',@{$recipients{'bcc'}}); } } - if (!$tolist && ref($content{'recuser'}) eq 'ARRAY') { + + my $broadcast_link; + if (($content{'courseid'}) && ($content{'recipid'} && + (ref($recipients{'course_broadcast'}) eq 'ARRAY') || + (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') || + (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) { + $broadcast_link = &recipients_link($r,\%content,\%recipients); + } + + if (((!$tolist) && (!$broadcast_link)) && ref($content{'recuser'}) eq 'ARRAY') { my @recipients; for (my $i=0; $i<@{$content{'recuser'}}; $i++) { $recipients[$i] = &Apache::loncommon::aboutmewrapper( @@ -2356,21 +2446,14 @@ sub displaymessage { if (defined($content{'baseurl'})) { $baseurl = &Apache::lonenc::check_encrypt($content{'baseurl'}); } + $r->print('
'); if ($from_student && $see_anonymous ) { - $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'})); - } - - my $broadcast_link; - if (($content{'courseid'}) && ($content{'recipid'} && - (ref($recipients{'course_broadcast'}) eq 'ARRAY') || - (ref($recipients{'group_cc_broadcast'}) eq 'ARRAY') || - (ref($recipients{'group_bcc_broadcast'}) eq 'ARRAY'))) { - $broadcast_link = &recipients_link($r,\%content,\%recipients); + $r->print(&Apache::loncommon::student_image_tag($content{'senderdomain'},$content{'sendername'}).'
'); } # Display LON-CAPA Message (Start) # Subject - $r->print('
' + $r->print('
' .&Apache::lonhtmlcommon::start_pick_box() .&Apache::lonhtmlcommon::row_title(&mt('Subject')) .$content{'subject'} @@ -2378,10 +2461,12 @@ sub displaymessage { ); if ($folder eq 'sent') { # To - $r->print(&Apache::lonhtmlcommon::row_title(&mt('To')) - .$tolist - .&Apache::lonhtmlcommon::row_closure() - ); + if ($tolist) { + $r->print(&Apache::lonhtmlcommon::row_title(&mt('To')) + .$tolist + .&Apache::lonhtmlcommon::row_closure() + ); + } if ($cclist) { $r->print(&Apache::lonhtmlcommon::row_title(&mt('Cc')) .$cclist @@ -2635,13 +2720,13 @@ sub recipients_link { $nothing=&Apache::lonhtmlcommon::javascript_nothing(); $height = 400; $width = 600; - my $start_page = - &Apache::loncommon::start_page('Broadcast List', undef, - {only_body => 1, - js_ready => 1,}); - my $end_page = &Apache::loncommon::end_page({js_ready => 1,}); - my $body = '

'.&mt("Recipients of broadcast message").'

'. - &Apache::loncommon::start_data_table(); + $start_page = + &Apache::loncommon::start_page('Broadcast List', undef, + {only_body => 1, + js_ready => 1,}); + $end_page = &Apache::loncommon::end_page({js_ready => 1,}); + $body = '

'.&mt("Recipients of broadcast message").'

'. + &Apache::loncommon::start_data_table(); my $cell = 0; $body .= &Apache::loncommon::start_data_table_row(); foreach my $item (@{$recipients->{$show.'_broadcast'}}) { @@ -2662,6 +2747,7 @@ sub recipients_link { $body =~ s{\n}{}g; $r->print(< +// ENDJS @@ -2738,15 +2824,14 @@ sub displayresource { sub header { my ($r,$title,$baseurl)=@_; - my $extra = &Apache::loncommon::studentbrowser_javascript(); if ($baseurl) { $extra .= ""; } - $r->print(&Apache::loncommon::start_page('Communication and Messages', + $r->print(&Apache::loncommon::start_page('Communication', $extra)); $r->print(&Apache::lonhtmlcommon::breadcrumbs - (($title?$title:'Communication and Messages'))); + (($title?$title:'Send and Receive Messages'))); } # ---------------------------------------------------------------- Print header @@ -3117,7 +3202,7 @@ sub sendoffmail { &Apache::loncommunicate::menu($r); } } else { - $r->print('

'.&mt('Could not deliver message').' '. + $r->print('

'.&Apache::lonhtmlcommon::confirm_success(&mt('Could not deliver message'),1).'
'. &mt('Please use the browser "Back" button and correct the recipient addresses ([_1]).',$sendstatus).'

'); } } @@ -3144,7 +3229,7 @@ sub handler { 'recordftf','sortedby','block','folder','startdis','interdis', 'showcommentbaseurl','dismode','group','subject','text','ref', 'msgstatus']); - $sqs='&sortedby='.$env{'form.sortedby'}; + $sqs='&sortedby='.$env{'form.sortedby'}; # ------------------------------------------------------ They checked for email unless ($env{'form.block'}) { @@ -3165,7 +3250,7 @@ sub handler { unless ($folder) { $folder=''; } else { - $sqs.='&folder='.&escape($folder); + $sqs.='&folder='.&escape($folder); } # ------------------------------------------------------------ Get Display Mode @@ -3197,7 +3282,7 @@ sub handler { $startdis++; } my $postedstartdis=$startdis+1; - $sqs.='&startdis='.$postedstartdis; + $sqs.='&startdis='.$postedstartdis; # --------------------------------------------------------------- Render Output @@ -3421,7 +3506,7 @@ sub handler { my $showfolder = $env{'form.newfolder'}; my ($makeresult,$warning) = &makefolder($env{'form.newfolder'}); if ($makeresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" created.',$showfolder).'
'); + $r->print(&mt('Folder "[_1]" created.',$showfolder).'
'); } else { $r->print(&mt('Creation failed.').' '.$makeresult.'
'. $warning); @@ -3436,7 +3521,7 @@ sub handler { my $showfolder = ''; my $delresult = &deletefolder($folder); if ($delresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" deleted.',$folder).'
'); + $r->print(&mt('Folder "[_1]" deleted.',$folder).'
'); $env{'form.folder'} = ''; } else { $r->print(&mt('Deletion failed.').' '.$delresult.'
'); @@ -3449,7 +3534,7 @@ sub handler { my $showfolder = $env{'form.renamed'}; my $renresult = &renamefolder($folder); if ($renresult eq 'ok') { - $r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'
'); + $r->print(&mt('Folder "[_1]" renamed to "[_2]".',$folder,$showfolder).'
'); } else { $r->print(&mt('Renaming failed.').' '.$renresult.'
'); $showfolder = $folder;