version 1.44, 2006/11/29 07:46:39
|
version 1.49, 2006/12/07 21:21:04
|
Line 138 my $interdis;
|
Line 138 my $interdis;
|
|
|
sub folderlist { |
sub folderlist { |
my $folder=shift; |
my $folder=shift; |
my @allfolders=&Apache::lonnet::getkeys('email_folders'); |
my %lt = &Apache::lonlocal::texthash( |
if ($allfolders[0]=~/^error:/) { @allfolders=(); } |
actn => 'Action', |
return '<form method="post" action="/adm/email">'. |
fold => 'Folder', |
&mt('Folder').': '. |
show => 'Show', |
&Apache::loncommon::select_form($folder,'folder', |
go => 'Go', |
('' => &mt('INBOX'),'trash' => &mt('TRASH'), |
); |
'new' => &mt('New Messages Only'), |
|
'critical' => &mt('Critical'), |
my %actions = &Apache::lonlocal::texthash( |
'sent' => &mt('Sent Messages'), |
view => 'View Folder', |
map { $_ => $_ } @allfolders)). |
rename => 'Rename Folder', |
' '.&mt('Show'). |
delete => 'Delete Folder', |
'<select name="interdis">'. |
); |
join("\n",map { '<option value="'.$_.'"'. |
$actions{'select_form_order'} = ['view','rename','delete']; |
($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' } |
|
(10,20,50,100,200)).'</select>'. |
my %permfolders = &get_permanent_folders(); |
'<input type="submit" value="'.&mt('View Folder').'" /><br />'. |
my $permlist = join("','",sort(keys(%permfolders))); |
|
my ($permlistkeys,$permlistvals); |
|
foreach my $key (sort(keys(%permfolders))) { |
|
$permlistvals .= $permfolders{$key}."','"; |
|
$permlistkeys .= $key."','"; |
|
} |
|
$permlistvals =~ s/','$//; |
|
$permlistkeys =~ s/','$//; |
|
my %gotfolders = &Apache::lonmsg::get_user_folders(); |
|
my %userfolders; |
|
|
|
foreach my $key (keys(%gotfolders)) { |
|
$userfolders{$key} = $key; |
|
} |
|
my @userorder = sort(keys(%userfolders)); |
|
my %formhash = (%permfolders,%userfolders); |
|
my $folderlist = join("','",@userorder); |
|
$folderlist .= "','".$permlistvals; |
|
|
|
$formhash{'select_form_order'} = ['','critical','new',@userorder,'sent','trash']; |
|
my $output = qq|<script type="text/javascript"> |
|
function folder_choice(targetform,caller) { |
|
var permfolders_keys = new Array('$permlistkeys'); |
|
var permfolders_vals = new Array('$permlistvals'); |
|
var allfolders = new Array('$folderlist'); |
|
if (caller == 'change') { |
|
if (targetform.folderaction.options[targetform.folderaction.selectedIndex].value == 'rename') { |
|
for (var i=0; i<permfolders_keys.length; i++) { |
|
if (permfolders_keys[i] == targetform.folder.value) { |
|
alert("The '"+permfolders_vals[i]+"' folder may not be renamed as it is a mail folder provided by the system."); |
|
return; |
|
} |
|
} |
|
var foldername=prompt('New Name for Folder','New Name'); |
|
if (foldername) { |
|
targetform.renamed.value=foldername; |
|
for (var i=0; i<allfolders.length; i++) { |
|
if (allfolders[i] == foldername) { |
|
alert("The folder may not be renamed '"+foldername+"' as this name is already in use for a system-provided or user-defined folder."); |
|
return; |
|
} |
|
} |
|
targetform.submit(); |
|
} |
|
} |
|
else { |
|
targetform.submit(); |
|
} |
|
} |
|
if (caller == 'new') { |
|
var newname=targetform.newfolder.value; |
|
if (newname) { |
|
for (var i=0; i<allfolders.length; i++) { |
|
if (allfolders[i] == newname) { |
|
alert("The new folder may not be named '"+newname+"' as this name is already in use for a system-provided or user-defined folder."); |
|
return; |
|
} |
|
} |
|
targetform.submit(); |
|
} |
|
} |
|
} |
|
</script>|; |
|
$output .= ' |
|
<form method="post" action="/adm/email" name="folderlist"> |
|
<table border="0" cellspacing="2" cellpadding="2"> |
|
<tr> |
|
<td align="left"> |
|
<table border="0" cellspacing="2" cellpadding="2"> |
|
<tr> |
|
<td align="center"><b>'.$lt{'fold'}.'</b><br />'."\n". |
|
&Apache::loncommon::select_form($folder,'folder',%formhash).' |
|
</td> |
|
<td align="center"><b>'.$lt{'show'}.'</b><br /> |
|
<select name="interdis">'. |
|
join("\n",map { '<option value="'.$_.'"'. |
|
($_==$interdis?' selected="selected"':'').'>'.$_.'</option>' |
|
} |
|
(10,20,50,100,200)).'</select> |
|
</td> |
|
<td align="center"><b>'.$lt{'actn'}.'</b><br />'. |
|
&Apache::loncommon::select_form('view','folderaction',%actions).' |
|
</td><td><br />'. |
|
'<input type="button" value="'.$lt{'go'}.'" onClick="javascript:folder_choice(this.form,'."'change'".');" /> |
|
</td> |
|
</tr> |
|
</table> |
|
</td><td> </td><td> </td><td> </td><td> </td> |
|
<td align="right"> |
|
<table><tr><td><br /> |
|
<input type="button" value="'.&mt('Make New Folder'). |
|
'" onClick="javascript:folder_choice(this.form,'."'new'".');" /></td>'. |
|
'<td align="center"><b>'.&mt('New Folder').'</b><br />'. |
|
'<input type="text" size="15" name="newfolder" value="" /> |
|
</td></tr></table> |
|
</td> |
|
</tr> |
|
</table>'."\n". |
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'. |
'<input type="hidden" name="sortedby" value="'.$env{'form.sortedby'}.'" />'. |
($folder=~/^(new|critical)/?'</form>':''); |
'<input type="hidden" name="renamed" value="" />'. |
|
($folder=~/^(new|critical)/?'</form>':''); |
|
return $output; |
|
} |
|
|
|
sub get_permanent_folders { |
|
my %permfolders = |
|
&Apache::lonlocal::texthash('' => 'INBOX', |
|
'trash' => 'TRASH', |
|
'new' => 'New Messages Only', |
|
'critical' => 'Critical', |
|
'sent' => 'Sent Messages', |
|
); |
|
return %permfolders; |
} |
} |
|
|
sub scrollbuttons { |
sub scrollbuttons { |
Line 195 sub statuschange {
|
Line 305 sub statuschange {
|
# ============================================================= Make new folder |
# ============================================================= Make new folder |
|
|
sub makefolder { |
sub makefolder { |
my ($newfolder)=@_; |
my ($newfolder) = @_; |
if (($newfolder eq 'sent') |
my %permfolders = &get_permanent_folders(); |
|| ($newfolder eq 'critical') |
my %userfolders = &Apache::lonmsg::get_user_folders(); |
|| ($newfolder eq 'trash') |
my ($outcome,$warning); |
|| ($newfolder eq 'new')) { return; } |
if (defined($userfolders{$newfolder})) { |
&Apache::lonnet::put('email_folders',{$newfolder => time}); |
return &mt('The folder name: "[_1]" is already in use for an existing folder.',$newfolder); |
|
} |
|
foreach my $perm (keys(%permfolders)) { |
|
if ($permfolders{$perm} eq $newfolder) { |
|
return &mt('The folder name: "[_1]" is already used for one of the folders automatically generated by the system.',$newfolder); |
|
} |
|
} |
|
if (&get_msgfolder_lock() eq 'ok') { |
|
my %counter_hash = &Apache::lonnet::get('email_folders',["\0".'idcount']); |
|
my $lastcount = $counter_hash{"\0".'idcount'}; |
|
my $folder_id = $lastcount + 1; |
|
while (defined($userfolders{$folder_id})) { |
|
$folder_id ++; |
|
} |
|
my %folderinfo = ( id => $folder_id, |
|
created => time, ); |
|
$outcome = |
|
&Apache::lonnet::put('email_folders',{$newfolder => \%folderinfo, |
|
"\0".'idcount' => $folder_id}); |
|
my $releaseresult = &release_msgfolder_lock(); |
|
if ($releaseresult ne 'ok') { |
|
$warning = $releaseresult; |
|
} |
|
} else { |
|
$outcome = |
|
&mt('Error - could not obtain lock on email folders record.'); |
|
} |
|
return ($outcome,$warning); |
|
} |
|
|
|
# ============================================================= Delete folder |
|
|
|
sub deletefolder { |
|
my ($folder)=@_; |
|
my %permfolders = &get_permanent_folders(); |
|
if (defined($permfolders{$folder})) { |
|
return &mt('The folder [_1] may not be deleted',$folder); |
|
} |
|
my %userfolders = &Apache::lonmsg::get_user_folders(); |
|
if (!defined($userfolders{$folder})) { |
|
return &mt('The folder [_1] does not exist so deletion is not required.', |
|
$folder); |
|
} |
|
# check folder is empty; |
|
my $suffix=&Apache::lonmsg::foldersuffix($folder); |
|
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); |
|
if (@messages > 0) { |
|
return &mt('The folder [_1] contains messages so it may not be deleted.'). |
|
'<br />'. |
|
&mt('Delete or move the messages to a different folder first.'); |
|
} |
|
my $delresult = &Apache::lonnet::del('email_folders',[$folder]); |
|
return $delresult; |
|
} |
|
|
|
sub renamefolder { |
|
my ($folder) = @_; |
|
my $newname = $env{'form.renamed'}; |
|
my %permfolders = &get_permanent_folders(); |
|
if ($env{'form.renamed'} eq '') { |
|
return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is an invalid name.',$folder,$newname); |
|
} |
|
if (defined($permfolders{$newname})) { |
|
return &mt('The folder "[_1]" may not be renamed to "[_2]" as the new name you requested is reserved for folders provided automatically by the system.',$folder,$newname); |
|
} |
|
my %userfolders = &Apache::lonmsg::get_user_folders(); |
|
if (defined($userfolders{$newname})) { |
|
return &mt('The folder "[_1]" may not be renamed to "[_2]" because the new name you requested is already being used for an existing folder.',$folder,$newname); |
|
} |
|
if (!defined($userfolders{$folder})) { |
|
return &mt('The folder "[_1]" could not be renamed to "[_2]" because the folder does not exist.',$folder,$newname); |
|
} |
|
my %folderinfo; |
|
if (ref($userfolders{$folder}) eq 'HASH') { |
|
%folderinfo = %{$userfolders{$folder}}; |
|
} else { |
|
%folderinfo = ( id => $folder, |
|
created => $userfolders{$folder},); |
|
} |
|
my $outcome = |
|
&Apache::lonnet::put('email_folders',{$newname => \%folderinfo}); |
|
if ($outcome eq 'ok') { |
|
$outcome = &Apache::lonnet::del('email_folders',[$folder]); |
|
} |
|
return $outcome; |
} |
} |
|
|
|
sub get_msgfolder_lock { |
|
# get lock for mail folder counter. |
|
my $lockhash = { "\0".'lock_counter' => time, }; |
|
my $tries = 0; |
|
my $gotlock = &Apache::lonnet::newput('email_folders',$lockhash); |
|
while (($gotlock ne 'ok') && $tries <3) { |
|
$tries ++; |
|
sleep(1); |
|
$gotlock = &Apache::lonnet::newput('email_folders',$lockhash); |
|
} |
|
return $gotlock; |
|
} |
|
|
|
sub release_msgfolder_lock { |
|
# remove lock |
|
my @del_lock = ("\0".'lock_counter'); |
|
my $dellockoutcome=&Apache::lonnet::del('email_folders',\@del_lock); |
|
if ($dellockoutcome ne 'ok') { |
|
return ('<br />'.&mt('Warning: failed to release lock for counter').'<br />'); |
|
} else { |
|
return 'ok'; |
|
} |
|
} |
|
|
|
|
# ======================================================== Move between folders |
# ======================================================== Move between folders |
|
|
sub movemsg { |
sub movemsg { |
Line 520 sub sortedmessages {
|
Line 739 sub sortedmessages {
|
my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_; |
my ($blocked,$startblock,$endblock,$numblocked,$folder) = @_; |
my $suffix=&Apache::lonmsg::foldersuffix($folder); |
my $suffix=&Apache::lonmsg::foldersuffix($folder); |
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); |
my @messages = &Apache::lonnet::getkeys('nohist_email'.$suffix); |
|
|
#unpack the varibles and repack into temp for sorting |
#unpack the varibles and repack into temp for sorting |
my @temp; |
my @temp; |
my %descriptions; |
my %descriptions; |
Line 623 sub get_course_desc {
|
Line 843 sub get_course_desc {
|
if (defined($env{'course.'.$fromcid.'.description'})) { |
if (defined($env{'course.'.$fromcid.'.description'})) { |
$description = $env{'course.'.$fromcid.'.description'}; |
$description = $env{'course.'.$fromcid.'.description'}; |
} else { |
} else { |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid); $description = $courseinfo{'description'}; |
my %courseinfo=&Apache::lonnet::coursedescription($fromcid); |
$description = $courseinfo{'description'}; |
$description = $courseinfo{'description'}; |
} |
} |
$$descriptions{$fromcid} = $description; |
$$descriptions{$fromcid} = $description; |
Line 640 sub disnew {
|
Line 860 sub disnew {
|
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'nm' => 'New Messages', |
'nm' => 'New Messages', |
'su' => 'Subject', |
'su' => 'Subject', |
'co' => 'Course/Group', |
'co' => 'Course', |
'da' => 'Date', |
'da' => 'Date', |
'us' => 'Username', |
'us' => 'Username', |
'op' => 'Open', |
'op' => 'Open', |
Line 669 sub disnew {
|
Line 889 sub disnew {
|
$blocked{$id} = 'ON'; |
$blocked{$id} = 'ON'; |
$numblocked ++; |
$numblocked ++; |
} else { |
} else { |
push @newmsgs, { |
push(@newmsgs, { |
msgid => $msgid, |
msgid => $msgid, |
sendtime => $sendtime, |
sendtime => $sendtime, |
shortsub => $shortsubj, |
shortsub => $shortsubj, |
from => $fromname, |
from => $fromname, |
fromdom => $fromdom, |
fromdom => $fromdom, |
course => $description |
course => $description, |
} |
}); |
} |
} |
} |
} |
} |
} |
Line 684 sub disnew {
|
Line 904 sub disnew {
|
if ($#newmsgs >= 0) { |
if ($#newmsgs >= 0) { |
$r->print(<<TABLEHEAD); |
$r->print(<<TABLEHEAD); |
<h2>$lt{'nm'}</h2> |
<h2>$lt{'nm'}</h2> |
<table class="LC_mail_list"><tr><th> </th> |
<table class="LC_mail_list"><tr><th> </th> |
<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr> |
<th>$lt{'da'}</th><th>$lt{'us'}</th><th>$lt{'do'}</th><th>$lt{'su'}</th><th>$lt{'co'}</th></tr> |
TABLEHEAD |
TABLEHEAD |
foreach my $msg (@newmsgs) { |
foreach my $msg (@newmsgs) { |
$r->print(<<"ENDLINK"); |
$r->print(<<"ENDLINK"); |
<tr class="LC_mail_new"> |
<tr class="LC_mail_new"> |
<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td> |
<td><a href="/adm/email?dismode=new&display=$msg->{'msgid'}">$lt{'op'}</a></td> |
ENDLINK |
ENDLINK |
foreach my $item ('sendtime','from','fromdom','shortsub','course') { |
foreach my $item ('sendtime','from','fromdom','shortsub','course') { |
$r->print("<td>$msg->{$item}</td>"); |
$r->print("<td>$msg->{$item}</td>"); |
} |
} |
$r->print("</td></tr>"); |
$r->print("</tr>"); |
} |
} |
$r->print('</table>'); |
$r->print('</table>'); |
} elsif ($numblocked == 0) { |
} elsif ($numblocked == 0) { |
Line 704 ENDLINK
|
Line 924 ENDLINK
|
if ($numblocked > 0) { |
if ($numblocked > 0) { |
my $beginblock = &Apache::lonlocal::locallocaltime($startblock); |
my $beginblock = &Apache::lonlocal::locallocaltime($startblock); |
my $finishblock = &Apache::lonlocal::locallocaltime($endblock); |
my $finishblock = &Apache::lonlocal::locallocaltime($endblock); |
if ($numblocked == 1) { |
$r->print('<h3>'.&mt('You have [quant,_1,blocked unread message,blocked unread messages].',$numblocked).'</h3>'."\n". |
$r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread message').".</h3>"); |
&mt('[quant,_1,message is,messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock).'<br />'."\n". |
$r->print(&mt('This message is not viewable because').' '); |
&Apache::loncommon::build_block_table($startblock,$endblock, |
} else { |
\%setters)); |
$r->print("<h3>".&mt('You have').' '.$numblocked.' '.&mt('blocked unread messages').".</h3>"); |
|
$r->print(&mt('These').' '.$numblocked.' '.&mt('messages are not viewable because ')); |
|
} |
|
$r->print( |
|
&mt('display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams').'.'); |
|
$r->print(&Apache::loncommon::build_block_table($startblock,$endblock, |
|
\%setters)); |
|
} |
} |
} |
} |
|
|
Line 780 ENDDISHEADER
|
Line 993 ENDDISHEADER
|
if ($lastdis>$#temp) { $lastdis=$#temp; } |
if ($lastdis>$#temp) { $lastdis=$#temp; } |
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); |
$r->print(&scrollbuttons($startdis,$number,$firstdis,$lastdis,$totalnumber)); |
$r->print('<form method="post" name="disall" action="/adm/email">'. |
$r->print('<form method="post" name="disall" action="/adm/email">'. |
'<table class="LC_mail_list"><tr><th colspan="3"> </th><th>'); |
'<table class="LC_mail_list"><tr><th colspan="3"> </th><th>'); |
if ($env{'form.sortedby'} eq "revdate") { |
if ($env{'form.sortedby'} eq "revdate") { |
$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>'); |
$r->print('<a href = "?sortedby=date'.$fsqs.'">'.&mt('Date').'</a></th>'); |
} else { |
} else { |
Line 806 ENDDISHEADER
|
Line 1019 ENDDISHEADER
|
} |
} |
$r->print('</th><th>'); |
$r->print('</th><th>'); |
if ($env{'form.sortedby'} eq "revcourse") { |
if ($env{'form.sortedby'} eq "revcourse") { |
$r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course/Group').'</a>'); |
$r->print('<a href = "?sortedby=course'.$fsqs.'">'.&mt('Course').'</a>'); |
} else { |
} else { |
$r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course/Group').'</a>'); |
$r->print('<a href = "?sortedby=revcourse'.$fsqs.'">'.&mt('Course').'</a>'); |
} |
} |
$r->print('</th><th>'); |
$r->print('</th><th>'); |
if ($env{'form.sortedby'} eq "revstatus") { |
if ($env{'form.sortedby'} eq "revstatus") { |
Line 871 ENDDISHEADER
|
Line 1084 ENDDISHEADER
|
'<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>'); |
'<p><input type="submit" name="markeddel" value="'.&mt('Delete Checked').'" /></p>'); |
} |
} |
$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />'); |
$r->print('<p><input type="submit" name="markedmove" value="'.&mt('Move Checked to Folder').'" />'); |
my @allfolders=&Apache::lonnet::getkeys('email_folders'); |
my %gotfolders = &Apache::lonmsg::get_user_folders(); |
if ($allfolders[0]=~/^error:/) { @allfolders=(); } |
my %userfolders; |
|
foreach my $key (keys(%gotfolders)) { |
|
$userfolders{$key} = $key; |
|
} |
$r->print( |
$r->print( |
&Apache::loncommon::select_form('','movetofolder', |
&Apache::loncommon::select_form('','movetofolder', |
( map { $_ => $_ } @allfolders)) |
%userfolders)); |
); |
|
my $postedstartdis=$startdis+1; |
my $postedstartdis=$startdis+1; |
$r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /></form>'); |
$r->print('<input type="hidden" name="folder" value="'.$folder.'" /><input type="hidden" name="startdis" value="'.$postedstartdis.'" /><input type="hidden" name="interdis" value="'.$env{'form.interdis'}.'" /></form>'); |
if ($numblocked > 0) { |
if ($numblocked > 0) { |
my $beginblock = &Apache::lonlocal::locallocaltime($startblock); |
my $beginblock = &Apache::lonlocal::locallocaltime($startblock); |
my $finishblock = &Apache::lonlocal::locallocaltime($endblock); |
my $finishblock = &Apache::lonlocal::locallocaltime($endblock); |
$r->print('<br /><br />'. |
$r->print('<br /><br />'. |
$numblocked.' '.&mt('message(s) is/are not viewable because display of LON-CAPA messages sent to you by other students between').' '.$beginblock.' '.&mt('and').' '.$finishblock.' '.&mt('is currently being blocked because of online exams.')); |
&mt('[_1,quant,message is, messages are] not viewable because display of LON-CAPA messages sent to you by other students between [_2] and [_3] is currently being blocked because of online exams.',$numblocked,$beginblock,$finishblock)); |
$r->print(&Apache::loncommon::build_block_table($startblock,$endblock, |
$r->print(&Apache::loncommon::build_block_table($startblock,$endblock, |
\%setters)); |
\%setters)); |
} |
} |
Line 1123 sub retrieve_instructor_comments {
|
Line 1338 sub retrieve_instructor_comments {
|
my ($user,$domain)=@_; |
my ($user,$domain)=@_; |
my $target=$env{'form.grade_target'}; |
my $target=$env{'form.grade_target'}; |
if (! $env{'request.course.id'}) { return; } |
if (! $env{'request.course.id'}) { return; } |
if (! &Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (! &Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
return; |
return; |
} |
} |
Line 1150 sub disfacetoface {
|
Line 1365 sub disfacetoface {
|
my ($r,$user,$domain)=@_; |
my ($r,$user,$domain)=@_; |
my $target=$env{'form.grade_target'}; |
my $target=$env{'form.grade_target'}; |
unless ($env{'request.course.id'}) { return; } |
unless ($env{'request.course.id'}) { return; } |
if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
$r->print('Not allowed'); |
$r->print('Not allowed'); |
return; |
return; |
Line 1232 sub general_message {
|
Line 1447 sub general_message {
|
|
|
sub facetoface { |
sub facetoface { |
my ($r,$stage)=@_; |
my ($r,$stage)=@_; |
if (!&Apache::lonnet::allowed('srm',$env{'request.course.id'}) |
if (!&Apache::lonnet::allowed('dff',$env{'request.course.id'}) |
&& ! &Apache::lonnet::allowed('srm',$env{'request.course.id'}. |
&& ! &Apache::lonnet::allowed('dff',$env{'request.course.id'}. |
'/'.$env{'request.course.sec'})) { |
'/'.$env{'request.course.sec'})) { |
$r->print('Not allowed'); |
$r->print('Not allowed'); |
return; |
return; |
Line 1598 sub blocktype_text {
|
Line 1813 sub blocktype_text {
|
'chat' => 'Chat', |
'chat' => 'Chat', |
'boards' => 'Discussion', |
'boards' => 'Discussion', |
'port' => 'Portfolio', |
'port' => 'Portfolio', |
'groups' => 'Groups' |
'groups' => 'Groups', |
|
'blogs' => 'Blogs', |
); |
); |
my $typeorder = ['com','chat','boards','port','groups']; |
my $typeorder = ['com','chat','boards','port','groups','blogs']; |
return ($typeorder,\%types); |
return ($typeorder,\%types); |
} |
} |
|
|
Line 2062 sub handler {
|
Line 2278 sub handler {
|
unless ($dismode) { |
unless ($dismode) { |
$dismode=''; |
$dismode=''; |
} else { |
} else { |
$sqs.='&dismode='.&escape($dismode); |
$sqs.='&dismode='.&escape($dismode); |
} |
} |
|
|
# --------------------------------------------------------------------- Display |
# --------------------------------------------------------------------- Display |
Line 2213 sub handler {
|
Line 2429 sub handler {
|
} |
} |
} elsif ($env{'form.newfolder'}) { |
} elsif ($env{'form.newfolder'}) { |
&printheader($r,'','New Folder'); |
&printheader($r,'','New Folder'); |
&makefolder($env{'form.newfolder'}); |
my $showfolder = $env{'form.newfolder'}; |
&Apache::loncommunicate::menu($r); |
my ($makeresult,$warning) = &makefolder($env{'form.newfolder'}); |
&disall($r,$env{'form.newfolder'}); |
if ($makeresult eq 'ok') { |
|
$r->print(&mt('Mail folder "[_1]" created.',$showfolder).'<br />'); |
|
} else { |
|
$r->print(&mt('Creation failed.').' '.$makeresult.'<br />'. |
|
$warning); |
|
$showfolder = $folder; |
|
} |
|
&Apache::loncommunicate::menu($r); |
|
&disall($r,$showfolder); |
} elsif ($env{'form.showcommentbaseurl'}) { |
} elsif ($env{'form.showcommentbaseurl'}) { |
&storedcommentlisting($r); |
&storedcommentlisting($r); |
|
} elsif ($env{'form.folderaction'} eq 'delete') { |
|
&printheader($r,'','Deleted Folder'); |
|
my $showfolder = ''; |
|
my $delresult = &deletefolder($folder); |
|
if ($delresult eq 'ok') { |
|
$r->print(&mt('Mail folder "[_1]" deleted.',$folder).'<br />'); |
|
} else { |
|
$r->print(&mt('Deletion failed.').' '.$delresult.'<br />'); |
|
$showfolder = $folder; |
|
} |
|
&Apache::loncommunicate::menu($r); |
|
&disall($r,$showfolder); |
|
} elsif ($env{'form.folderaction'} eq 'rename') { |
|
&printheader($r,'','Renamed Folder'); |
|
my $showfolder = $env{'form.renamed'}; |
|
my $renresult = &renamefolder($folder); |
|
if ($renresult eq 'ok') { |
|
$r->print(&mt('Mail folder "[_1]" renamed "[_2]".',$folder,$showfolder).'<br />'); |
|
} else { |
|
$r->print(&mt('Renaming failed.').' '.$renresult.'<br />'); |
|
$showfolder = $folder; |
|
} |
|
&Apache::loncommunicate::menu($r); |
|
&disall($r,$showfolder); |
} else { |
} else { |
&printheader($r,'','Display All Messages'); |
&printheader($r,'','Display All Messages'); |
&Apache::loncommunicate::menu($r); |
&Apache::loncommunicate::menu($r); |