';
}
}
sub rss_link {
- my ($url) = @_;
- return qq||;
+ my ($uname,$udom)=@_;
+ my $result;
+ my $server = &Apache::lonnet::absolute_url();
+ my %feednames=&Apache::lonnet::dump('nohist_all_rss_feeds',$udom,$uname);
+ foreach my $feed (sort(keys(%feednames))) {
+ next if ($feed =~/^\s*$/ ||
+ $feed =~ /^error:/ ||
+ $feed =~/^feed_display_option_/ );
+ my $url= $server.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss';
+ my $title = $feed;
+ $title =~ s/_/ /g;
+ $result.=qq|
+
+|;
+ }
+ return $result;
}
{
@@ -212,7 +244,7 @@ sub add_blog_entry_link {
}
sub blocking_blogdisplay {
- my ($uname,$udom,$html,$filterfeedname) = @_;
+ my ($uname,$udom,$html,$filterfeedname,$clientip) = @_;
my $user = &Apache::loncommon::plainname($uname,$udom);
if ($html) {
$user = &Apache::loncommon::aboutmewrapper($user,$uname,$udom);
@@ -221,31 +253,45 @@ sub blocking_blogdisplay {
}
my %setters;
my ($blocked,$output,$blockcause);
- my ($startblock,$endblock) =
- &Apache::loncommon::blockcheck(\%setters,'blogs');
+ my ($startblock,$endblock,$triggerblock,$by_ip,$blockdom) =
+ &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip);
if ($startblock && $endblock) {
$blockcause = 'user';
+ } elsif ($by_ip) {
+ $blockcause = 'ip';
} else {
if (($uname ne $env{'user.name'}) || ($udom ne $env{'user.domain'})) {
($startblock,$endblock) =
- &Apache::loncommon::blockcheck(\%setters,'blogs',
+ &Apache::loncommon::blockcheck(\%setters,'blogs',$clientip,
$uname,$udom);
$blockcause = 'blogowner';
}
}
- if ($startblock && $endblock) {
+ if (($startblock && $endblock) || ($by_ip)) {
$blocked = 1;
- my $showstart = &Apache::lonlocal::locallocaltime($startblock);
- my $showend = &Apache::lonlocal::locallocaltime($endblock);
- $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);
+ if ($startblock && $endblock) {
+ my $showstart = &Apache::lonlocal::locallocaltime($startblock);
+ my $showend = &Apache::lonlocal::locallocaltime($endblock);
+ $output = &mt('Blogs belonging to [_1] are unavailable from [_2] to [_3].',$user,$showstart,$showend);
+ } else {
+ $output = &mt('Blogs are unavailable from your current IP address: [_1].',$clientip);
+ }
if ($html) {$output.=' ';}
if ($blockcause eq 'user') {
$output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
if ($html) {
- $output .= ' '.
- &Apache::loncommon::build_block_table($startblock,
- $endblock,\%setters);
+ #$output .= ' '.
+ #&Apache::loncommon::build_block_table($startblock,
+ # $endblock,\%setters);
+ my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);
+ $output .= '
'.$blocktext;
}
+ } elsif ($blockcause eq 'ip') {
+ my $showdom = &Apache::lonnet::domain($blockdom);
+ if ($showdom eq '') {
+ $showdom = $blockdom;
+ }
+ $output .= &mt('This restriction was set by an administrator in the [_1] LON-CAPA domain',$showdom);
} else {
$output .= &mt('This is because the blog owner is a student in one or more courses in which communication is being blocked.');
}
@@ -267,7 +313,9 @@ sub handler {
$edit=1;
$html=1;
}
- if (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
+ if (($mode eq 'adm') && (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))
+ && ($uname eq $env{'course.'.$env{'request.course.id'}.'.num'} &&
+ $udom eq $env{'course.'.$env{'request.course.id'}.'.domain'})) {
$edit=1;
$html=1;
}
@@ -287,17 +335,36 @@ sub handler {
my $filterfeedname=&filterfeedname($filename);
my $feedname=&feedname($filename);
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
- my ($blocked,$blocktext);
+ my ($blocked,$blocktext,$disabled,$disabletext);
if (!&Apache::lonnet::is_course($udom,$uname)) {
- ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
+ my $clientip = &Apache::lonnet::get_requestor_ip($r);
+ ($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname,$clientip);
+ if (&Apache::lonnet::usertools_access($uname,$udom,'blog')) {
+ $disabled = 0;
+ } else {
+ $disabled = 1;
+ if ($html) {
+ $disabletext = '
'.&mt('No user blog available') .'
'.
+ &mt('This is a result of one of the following:').'
'.
+ '
'.&mt('The administrator of this domain has disabled blog functionality for this specific user.').'
'.
+ '
'.&mt('The domain has been configured to disable, by default, blog functionality for all users in the domain.').'
'.
+ '
';
+ } else {
+ $disabletext = &mt('No user blog available');
+ }
+ }
}
if ($html) {
- my $title = $displayfeedname?$displayfeedname
- :"Available RSS Feeds and Blogs";
- $r->print(&Apache::loncommon::start_page($title,undef,
- {'domain' => $udom,
- 'force_register' =>
- $env{'form.register'}}).
+# my $title = $displayfeedname?$displayfeedname:"Available RSS Feeds and Blogs";
+ my $title = "My Space";
+ my $rss_link = &Apache::lonrss::rss_link($uname,$udom);
+ my $head_extra = $rss_link.'';
+ my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
+ $r->print(&Apache::loncommon::start_page($title,$head_extra,
+ {'bread_crumbs' => $brcrumb,
+ 'domain' => $udom,
+ 'force_register' => $env{'form.register'}}).
&changed_js());
} else { # render RSS
my $server = &Apache::lonnet::absolute_url();
@@ -312,7 +379,7 @@ sub handler {
my $newid = &get_new_feed_id();
# Is this user for real?
my $homeserver=&Apache::lonnet::homeserver($uname,$udom);
- if ($html && !$blocked) {
+ if ($html && !$blocked && !$disabled) {
# Any new feeds or renaming of feeds?
if ($edit) {
# Hide a feed?
@@ -344,6 +411,9 @@ sub handler {
} elsif ($blocked) {
$r->print($blocktext);
$r->print(($html?&Apache::loncommon::end_page():''."\n"));
+ } elsif ($disabled) {
+ $r->print($disabletext);
+ $r->print(($html?&Apache::loncommon::end_page():''."\n"));
} else { # is indeed a user
# Course or user?
my $name='';
@@ -355,9 +425,10 @@ sub handler {
}
# Add a new feed
if (($html) && ($edit)) {
- $r->print('');
}
if ($displayfeedname) { # this is an existing feed
@@ -457,7 +528,7 @@ sub handler {
($html?'
':'').
&mt('LON-CAPA Feed "[_1]" for [_2]',$displayfeedname,$name).
($displayoption eq 'hidden'?' ('.&mt('Hidden').')':'').
- ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data"><br />'.
+ ($html?'</h3>'.($edit?'<form method="post" name="lonhomework" enctype="multipart/form-data" action=""><br />'.
&mt('Name of this Feed').
': <input type="text" size="50" name="newblogname" value="'.
$displayfeedname.'" />':'').'<ul>':''));
@@ -466,7 +537,7 @@ sub handler {
}
# Get feed items
my %newsfeed=&Apache::lonnet::dump($feedname,$udom,$uname);
- foreach my $entry (sort(keys(%newsfeed)),$newid.'_status') {
+ foreach my $entry (sort {$b cmp $a} (keys(%newsfeed)),$newid.'_status') {
if ($entry=~/^(\d+)\_status$/) { # is an entry
my $id=$1;
if ($edit) {
@@ -474,7 +545,7 @@ sub handler {
'private' => 'private',
'hidden' => 'hidden',
'delete' => 'delete',
- 'store' => 'Store changes',
+ 'store' => 'Select',
'title' => 'Title',
'link' => 'Link',
'description' => 'Description',
@@ -482,7 +553,19 @@ sub handler {
my $uploadlink;
if ($entry==$newid) {
# Generate upload link only for last (new) entry
- $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both');
+# Calculate the quota space available in the user's portfolio
+ my $disk_quota = &Apache::loncommon::get_user_quota($env{'user.name'},
+ $env{'user.domain'}); # expressed in MB
+ my $portfolio_root = '/userfiles/portfolio';
+ my $getpropath = 1;
+ my $current_disk_usage = &Apache::lonnet::diskusage(
+ $env{'user.domain'}, $env{'user.name'},
+ $portfolio_root, $getpropath); # Expressed in kB
+ # Convert to MB for use in file_selector()
+ my $free_space = $disk_quota - ($current_disk_usage / 1024.);
+ # Format this number since it will be displayed onscreen
+ $free_space = sprintf("%.1f", $free_space);
+ $uploadlink=&Apache::inputtags::file_selector(0,0,'*','both','',$free_space);
} else {
# Otherwise, display
$uploadlink=''.$newsfeed{$id.'_enclosureurl'}.''.
@@ -496,20 +579,20 @@ sub handler {