--- loncom/interface/lonrss.pm 2013/05/06 16:15:59 1.51
+++ loncom/interface/lonrss.pm 2021/11/30 17:35:10 1.60
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.51 2013/05/06 16:15:59 raeburn Exp $
+# $Id: lonrss.pm,v 1.60 2021/11/30 17:35:10 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -128,8 +128,8 @@ sub advertisefeeds {
}
if ($feeds) {
return '<h4>'.&mt('Available RSS Feeds and Blogs').'</h4><ul>'.$feeds.'</ul>';
- } else {
- return '';
+ } elsif (!$edit) {
+ return '<h4>'.&mt('No available RSS Feeds and Blogs').'</h4>';
}
}
@@ -244,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);
@@ -253,23 +253,29 @@ 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.='<br />';}
if ($blockcause eq 'user') {
$output .= &mt('This is because you are a student in one or more courses in which communication is being blocked.');
@@ -277,9 +283,15 @@ sub blocking_blogdisplay {
#$output .= '<br />'.
#&Apache::loncommon::build_block_table($startblock,
# $endblock,\%setters);
- my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs');
+ my ($blocked, $blocktext) = Apache::loncommon::blocking_status('blogs',$clientip);
$output .= '<br /><br />'.$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.');
}
@@ -325,7 +337,8 @@ sub handler {
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
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 {
@@ -345,8 +358,10 @@ sub handler {
# 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.'<script type="text/javascript" '
+ .'src="/res/adm/includes/file_upload.js"></script>';
my $brcrumb = [{href=>$rss_link,text=>"Available RSS Feeds and Blogs"}];
- $r->print(&Apache::loncommon::start_page($title,$rss_link,
+ $r->print(&Apache::loncommon::start_page($title,$head_extra,
{'bread_crumbs' => $brcrumb,
'domain' => $udom,
'force_register' => $env{'form.register'}}).
@@ -411,7 +426,7 @@ sub handler {
# Add a new feed
if (($html) && ($edit)) {
$r->print('<h4>' . &mt('New RSS Feed or Blog'). '</h4>');
- $r->print('<form method="post" name="makenewfeed">');
+ $r->print('<form method="post" name="makenewfeed" action="">');
$r->print(&mt('Name').": <input type='text' size='40' name='namenewblog' />");
$r->print('<input type="submit" value="'.&mt('New Feed').'" />');
$r->print('</form>');
@@ -513,7 +528,7 @@ sub handler {
($html?'<hr /><h3>':'<title>').
&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>':'</title>'));
@@ -538,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='<tt>'.$newsfeed{$id.'_enclosureurl'}.'</tt>'.
@@ -552,20 +579,20 @@ sub handler {
<li>
<label><input name='$id\_modified' type='checkbox' value="modified" /> $lt{'store'}</label>
-<label><input name='$id\_status' type="radio" value="public" $status{'public'} onClick="changed(this.form,'$id');" /> $lt{'public'}</label>
+<label><input name='$id\_status' type="radio" value="public" $status{'public'} onclick="changed(this.form,'$id');" /> $lt{'public'}</label>
-<label><input name='$id\_status' type="radio" value="private" $status{'private'} onClick="changed(this.form,'$id');" /> $lt{'private'}</label>
+<label><input name='$id\_status' type="radio" value="private" $status{'private'} onclick="changed(this.form,'$id');" /> $lt{'private'}</label>
-<label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onClick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
+<label><input name='$id\_status' type="radio" value="hidden" $status{'hidden'} onclick="changed(this.form,'$id');" /> $lt{'hidden'}</label>
-<label><input name='$id\_status' type="radio" value="deleted" onClick="changed(this.form,'$id');" /> $lt{'delete'}</label>
+<label><input name='$id\_status' type="radio" value="deleted" onclick="changed(this.form,'$id');" /> $lt{'delete'}</label>
<br />
$lt{'title'}:
-<input name='$id\_title' type='text' size='60' value='$newsfeed{$id.'_title'}' onChange="changed(this.form,'$id');" /><br />
+<input name='$id\_title' type='text' size='60' value='$newsfeed{$id.'_title'}' onchange="changed(this.form,'$id');" /><br />
$lt{'description'}:<br />
-<textarea name='$id\_description' rows="6" cols="80" onChange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea><br />
+<textarea name='$id\_description' rows="6" cols="80" onchange="changed(this.form,'$id');">$newsfeed{$id.'_description'}</textarea><br />
$lt{'link'}:
-<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onChange="changed(this.form,'$id');" /><br />
+<input name='$id\_link' type='text' size='60' value='$newsfeed{$id.'_link'}' onchange="changed(this.form,'$id');" /><br />
$lt{'enc'} -
$uploadlink
<hr /></li>
@@ -614,9 +641,10 @@ ENDEDIT
($displayoption eq 'hidden'?'<input type="submit" name="advertisethisblog" value="'.&mt('Advertise this Feed').'" />':
'<input type="submit" name="hidethisblog" value="'.&mt('Hide this Feed').'" />'));
}
+ $r->print('</form>');
}
} # was a real display feedname
- $r->print(($html?'</form>'.&Apache::loncommon::end_page():'</channel></rss>'."\n"));
+ $r->print(($html?&Apache::loncommon::end_page():'</channel></rss>'."\n"));
} # a real user
return OK;
} # end handler