[LON-CAPA-cvs] cvs: loncom /interface lonrss.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Mon, 04 Dec 2006 21:51:31 -0000
albertel Mon Dec 4 16:51:31 2006 EDT
Modified files:
/loncom/interface lonrss.pm
Log:
- switch to helper re
Index: loncom/interface/lonrss.pm
diff -u loncom/interface/lonrss.pm:1.29 loncom/interface/lonrss.pm:1.30
--- loncom/interface/lonrss.pm:1.29 Fri Dec 1 15:17:47 2006
+++ loncom/interface/lonrss.pm Mon Dec 4 16:51:31 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network
# RSS Feeder
#
-# $Id: lonrss.pm,v 1.29 2006/12/01 20:17:47 raeburn Exp $
+# $Id: lonrss.pm,v 1.30 2006/12/04 21:51:31 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -29,7 +29,7 @@
package Apache::lonrss;
use strict;
-use LONCAPA;
+use LONCAPA (:DEFAULT :match);
use Apache::Constants qw(:common);
use Apache::loncommon;
use Apache::lonnet;
@@ -288,7 +288,7 @@
my $feedname=&feedname($filename);
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom);
my ($blocked,$blocktext);
- if ($uname !~ /^\d\w\d[\w\-.]+$/) {
+ if ($uname !~ /^$match_courseid$/) {
($blocked,$blocktext) = &blocking_blogdisplay($uname,$udom,$html,$filterfeedname);
}
if ($html) {
@@ -347,7 +347,7 @@
} else { # is indeed a user
# Course or user?
my $name='';
- if ($uname =~ /^\d\w\d[\w\-.]+$/) {
+ if ($uname =~ /^$match_courseid$/) {
my %cenv=&Apache::lonnet::dump('environment',$udom,$uname);
$name=$cenv{'description'};
} else {