version 1.29, 2006/12/01 20:17:47
|
version 1.31, 2006/12/04 22:10:28
|
Line 29
|
Line 29
|
package Apache::lonrss; |
package Apache::lonrss; |
|
|
use strict; |
use strict; |
use LONCAPA; |
use LONCAPA qw(:DEFAULT :match); |
use Apache::Constants qw(:common); |
use Apache::Constants qw(:common); |
use Apache::loncommon; |
use Apache::loncommon; |
use Apache::lonnet; |
use Apache::lonnet; |
Line 288 sub handler {
|
Line 288 sub handler {
|
my $feedname=&feedname($filename); |
my $feedname=&feedname($filename); |
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
my ($blocked,$blocktext); |
my ($blocked,$blocktext); |
if ($uname !~ /^\d\w\d[\w\-.]+$/) { |
if ($uname !~ /^$match_courseid$/) { |
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); |
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname); |
} |
} |
if ($html) { |
if ($html) { |
Line 347 sub handler {
|
Line 347 sub handler {
|
} else { # is indeed a user |
} else { # is indeed a user |
# Course or user? |
# Course or user? |
my $name=''; |
my $name=''; |
if ($uname =~ /^\d\w\d[\w\-.]+$/) { |
if ($uname =~ /^$match_courseid$/) { |
my %cenv=&Apache::lonnet::dump('environment',$udom,$uname); |
my %cenv=&Apache::lonnet::dump('environment',$udom,$uname); |
$name=$cenv{'description'}; |
$name=$cenv{'description'}; |
} else { |
} else { |