--- loncom/interface/groupboards.pm 2006/08/19 01:18:25 1.9
+++ loncom/interface/groupboards.pm 2013/11/23 20:40:57 1.21
@@ -1,6 +1,8 @@
# The LearningOnline Network
# Group Bulletin Boards Manager
#
+# $Id: groupboards.pm,v 1.21 2013/11/23 20:40:57 raeburn Exp $
+#
# Copyright Michigan State University Board of Trustees
#
# This file is part of the LearningOnline Network with CAPA (LON-CAPA).
@@ -28,10 +30,10 @@ package Apache::groupboards;
use strict;
use Apache::Constants qw(:common :http);
-use Apache::loncommon;
+use Apache::loncommon();
use Apache::lonnet;
-use Apache::lonuserstate;
-use Apache::lonratedt;
+use Apache::lonuserstate();
+use LONCAPA::map();
use Apache::lonlocal;
use LONCAPA;
@@ -59,7 +61,7 @@ sub handler {
my $gpterm = &Apache::loncommon::group_term();
my $ucgpterm = $gpterm;
$ucgpterm =~ s/^(\w)/uc($1)/e;
- my $bodytitle = $crstype.' Discussion Boards';
+ my $bodytitle = $ucgpterm.' Discussion Boards';
my $group = $env{'form.group'};
$group =~ s/\W//g;
my ($description,$earlyout,$refarg);
@@ -70,7 +72,7 @@ sub handler {
&Apache::lonhtmlcommon::clear_breadcrumbs();
if (!defined($group)) {
- $earlyout = &mt('No [_1] defined, so there are no [_1] discussion boards to display',$gpterm);
+ $earlyout = &mt("No $gpterm defined, so there are no $gpterm discussion boards to display");
$r->print(&display_error($cdom,$cnum,$group,$description,$gpterm,
$ucgpterm,$bodytitle,$earlyout,$refarg));
return OK;
@@ -94,7 +96,7 @@ sub handler {
'/'.$group);
}
if (!$can_view) {
- $earlyout=&mt('You do not have privileges to view discussion boards in this [_1]',$gpterm);
+ $earlyout=&mt("You do not have privileges to view discussion boards in this $gpterm");
$r->print(&display_error($cdom,$cnum,$group,$description,$gpterm,
$ucgpterm,$bodytitle,$earlyout,$refarg));
return OK;
@@ -103,11 +105,11 @@ sub handler {
if (($can_create) || (&Apache::lonnet::allowed('mdg',$env{'request.course.id'}))) {
$r->print(&boards_header($cdom,$cnum,$group,$description,$gpterm,
$ucgpterm,$bodytitle,$refarg));
- my ($outcome,$newurl,$bbtitle,$dellockoutcome) =
+ my ($outcome,$newurl,$bbtitle,$lockfreed) =
&create_board($cdom,$cnum,$group,$env{'form.newbul'});
if ($outcome eq 'ok') {
my ($furl,$ferr)= &Apache::lonuserstate::readmap($cdom.'/'.$cnum);
- $r->print(&mt('The new discussion board was added successfully.<br />'));
+ $r->print(&mt('The new discussion board was added successfully.').'<br />');
$r->print('<table border="0"><tr><td>'.
'<a href="'.$newurl.'?group='.$group.'&'.$refarg.
'">'.&mt('Edit [_1] board',$bbtitle).'</a></td>'.
@@ -115,8 +117,12 @@ sub handler {
'<a href="/adm/groupboards?group='.$group.'&'.
$refarg.'">'.&mt('View all group discussion boards').
'</a></td></tr></table>');
- if ($dellockoutcome ne 'ok') {
- $r->print(&mt('There was a problem removing a lockfile for the group ([_1]). This may prevent creation of additional bulletin boards in this group. Please contact the system administrator for your LON-CAPA domain.'));
+ if ($lockfreed ne 'ok') {
+ $r->print(&mt('There was a problem removing a lockfile for the group ([_1]).',$description).'<br />'.
+ &mt('This may prevent creation of additional discussion boards in this group.').'<br />'.
+ &mt('Please contact the [_1]helpdesk[_2] for assistance.',
+ '<a href="/adm/helpdesk">','</a>')
+ );
}
} else {
$r->print(&mt('There was a problem creating the new discussion board - [_1]','<span class="LC_error">'.$outcome.'</span>').'<br /><a href="/adm/groupboards?group='.$group.'">'.
@@ -148,14 +154,19 @@ function makebulboard() {
$r->print('<br /><form method="post" name="newbb" action="/adm/groupboards">'.
"\n".'<input type="button" name="bbbutton" value="'.
&mt('New Discussion Board').
- '" onClick="javascript:makebulboard();" />'."\n".
+ '" onclick="javascript:makebulboard();" />'."\n".
'<input type="hidden" name="newbul" />'."\n".
'<input type="hidden" name="group" value="'.$group.'" />'.
'<input type="hidden" name="ref" value="'.$env{'form.ref'}.'" />'.
"\n".'</form><br />');
}
if (@{$groupboards} > 0) {
- $r->print('<br />');
+ $r->print('<br />'
+ .&Apache::loncommon::start_data_table()
+ .&Apache::loncommon::start_data_table_header_row()
+ .'<th>'.&mt('Discussion Boards').'</th>'
+ .&Apache::loncommon::end_data_table_header_row()
+ );
foreach my $board (@{$groupboards}) {
my $board_url = $$boards{$board}{'url'};
if ($board_url =~ /\?/) {
@@ -163,12 +174,20 @@ function makebulboard() {
} else {
$board_url .= '?group='.$group;
}
- $r->print('<a href="'.$board_url.'&'.$refarg.'">'.
- $$boards{$board}{'title'}.'</a><br />');
+ $r->print(&Apache::loncommon::start_data_table_row()
+ .'<td>'
+ .'<a href="'.$board_url.'&'.$refarg.'">'
+ .$$boards{$board}{'title'}.'</a>'
+ .'</td>'
+ .&Apache::loncommon::end_data_table_row()
+ );
}
+ $r->print(&Apache::loncommon::end_data_table());
} else {
- $r->print('<br />'.&mt('There are currently no discussion boards in this [_1].',
- $gpterm));
+ $r->print('<p class="LC_info">'
+ .&mt('There are currently no discussion boards in this '.$gpterm.'.',)
+ .'</p>'
+ );
}
$r->print(&Apache::loncommon::end_page());
return OK;
@@ -176,69 +195,31 @@ function makebulboard() {
sub create_board {
my ($cdom,$cnum,$group,$bbtitle) = @_;
- my ($outcome,$boardid,$newurl);
+ my ($outcome,$newurl,$idtype);
$bbtitle=&unescape($bbtitle);
- # get lock on nohist_groupboards file
- my $lockhash = {
- $group."\0".'locked_boardids' => $env{'user.name'}.
- ':'.$env{'user.domain'},
- };
- my $tries = 0;
- my $gotlock = &Apache::lonnet::newput('nohist_groupboards',$lockhash,$cdom,$cnum);
- my $dellockoutcome;
- while (($gotlock ne 'ok') && $tries <3) {
- $tries ++;
- sleep 1;
- $gotlock = &Apache::lonnet::newput('nohist_groupboards',$lockhash,$cdom,$cnum);
- }
- if ($gotlock eq 'ok') {
- my %curr_boards = &Apache::lonnet::dump('nohist_groupboards',$cdom,$cnum,$group);
- $boardid = time;
- my $idtries = 0;
- while(exists($curr_boards{$group."\0".$boardid}) && $idtries < 20) {
- $boardid ++;
- $idtries ++;
- }
- if (!exists($curr_boards{$group."\0".$boardid})) {
- my %new_board = (
- $group."\0".$boardid => $env{'user.name'}.':'.
- $env{'user.domain'},
- );
- my $putresult = &Apache::lonnet::put('nohist_groupboards',\%new_board,
- $cdom,$cnum);
- if ($putresult ne 'ok') {
- $outcome = 'error storing new board: '.$putresult;
- } else {
- $newurl = '/adm/'.$cdom.'/'.$cnum.'/'.$boardid.
- '/bulletinboard';
- }
- } else {
- $outcome = ('error: no unique ID for the new board available.');
- }
- # remove lock
- my @del_lock = ($group."\0".'locked_boardids');
- $dellockoutcome = &Apache::lonnet::del('nohist_groupboards',\@del_lock,$cdom,$cnum);
+ $idtype = 'inc';
+ my ($boardid,$dellock,$error) =
+ &Apache::lonnet::get_timebased_id($group,'boardids','groupboards',
+ $cdom,$cnum);
+ if ($boardid) {
+ $newurl = '/adm/'.$cdom.'/'.$cnum.'/'.$boardid.'/bulletinboard';
} else {
- $outcome = "error: could not obtain lockfile\n";
- $dellockoutcome = 'ok';
- }
- if (!$newurl) {
- return ($outcome,$newurl,$bbtitle,$dellockoutcome);
+ return ($error,$newurl,$bbtitle,$dellock);
}
- $newurl=&unescape($newurl);
+
# need to check here if group_boards_$group.sequence is in the course
# if not - add it as an item in group_folder_$group.sequence
my $allbbsmap = &Apache::longroup::get_bbfolder_url($cdom,$cnum,$group);
if ($allbbsmap =~ m|^/uploaded|) {
- my ($errtext,$fatal)=&Apache::lonratedt::mapread($allbbsmap);
+ my ($errtext,$fatal)=&LONCAPA::map::mapread($allbbsmap);
if (!$fatal) {
- my $newidx=&Apache::lonratedt::getresidx($newurl);
- $Apache::lonratedt::resources[$newidx]=$bbtitle.':'.$newurl.
+ my $newidx=&LONCAPA::map::getresidx($newurl);
+ $LONCAPA::map::resources[$newidx]=$bbtitle.':'.$newurl.
':false:normal:res';
- push(@Apache::lonratedt::order,$newidx);
- my ($errtext,$fatal)=&Apache::lonratedt::storemap($allbbsmap,1);
+ push(@LONCAPA::map::order,$newidx);
+ my ($errtext,$fatal)=&LONCAPA::map::storemap($allbbsmap,1,1);
if ($fatal) {
- $outcome = "error: failed to store discussion boards map - $errtext\n";
+ $outcome = "error: failed to save discussion boards map - $errtext\n";
} else {
my %boardinfo = (
'group' => $group,
@@ -253,7 +234,7 @@ sub create_board {
$outcome = 'error: discussion boards folder absent, '.
'or in unexpected location - '.$allbbsmap."\n";
}
- return ($outcome,$newurl,$bbtitle,$dellockoutcome);
+ return ($outcome,$newurl,$bbtitle,$dellock);
}
sub display_error {