version 1.23, 2006/05/18 22:30:11
|
version 1.28, 2006/10/02 16:47:57
|
Line 93 sub advertisefeeds {
|
Line 93 sub advertisefeeds {
|
$mode='adm'; |
$mode='adm'; |
} |
} |
foreach my $feed (sort(keys(%feednames))) { |
foreach my $feed (sort(keys(%feednames))) { |
if ($feed ne '' |
if (($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) { |
&& ($feed!~/^error\:/) && ($feed!~/^feed\_display\_option\_/)) { |
|
my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; |
my $feedurl='http://'.$ENV{'HTTP_HOST'}.'/public/'.$udom.'/'.$uname.'/'.$feed.'.rss'; |
my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; |
my $htmlurl='http://'.$ENV{'HTTP_HOST'}.'/'.$mode.'/'.$udom.'/'.$uname.'/'.$feed.'_rss.html'; |
if ($feednames{'feed_display_option_'.$feed} eq 'hidden') { |
if ($feednames{'feed_display_option_'.$feed} eq 'hidden') { |
Line 140 sub editentry {
|
Line 139 sub editentry {
|
} |
} |
my $feedname=&feedname($filename); |
my $feedname=&feedname($filename); |
&Apache::lonnet::put('nohist_all_rss_feeds', |
&Apache::lonnet::put('nohist_all_rss_feeds', |
{ &filterfeedname($filename) => &displayfeedname($filename,$uname,$udom) }, |
{ &filterfeedname($filename) => |
|
(&displayfeedname($filename,$uname,$udom))[0] }, |
$udom,$uname); |
$udom,$uname); |
return &Apache::lonnet::put($feedname,{ |
return &Apache::lonnet::put($feedname,{ |
$id.'_title' => $title, |
$id.'_title' => $title, |
Line 200 sub add_blog_entry_link {
|
Line 200 sub add_blog_entry_link {
|
my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_; |
my ($id,$uname,$udom,$filename,$title,$description,$url,$status,$encurl,$enctype,$linktext)=@_; |
return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='. |
return "<a href='/adm/$udom/$uname/".&filterfeedname($filename).'_rss.html?queryid='. |
&escape($id). |
&escape($id). |
'&title='.&escape($title). |
'&title='.&escape($title). |
'&description='.&escape($description). |
'&description='.&escape($description). |
'&url='.&escape($url). |
'&url='.&escape($url). |
'&status='.&escape($status). |
'&status='.&escape($status). |
'&encurl='.&escape($encurl). |
'&encurl='.&escape($encurl). |
'&enctype='.&escape($enctype). |
'&enctype='.&escape($enctype). |
"'>".$linktext.'</a>'; |
"'>".$linktext.'</a>'; |
|
|
} |
} |
Line 241 sub handler {
|
Line 241 sub handler {
|
my $feedname=&feedname($filename); |
my $feedname=&feedname($filename); |
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
my ($displayfeedname,$displayoption)=&displayfeedname($filename,$uname,$udom); |
if ($html) { |
if ($html) { |
$r->print(&Apache::loncommon::start_page(($displayfeedname?$displayfeedname:&mt("Available RSS Feeds and Blogs")),undef, |
my $title = $displayfeedname?$displayfeedname |
|
:"Available RSS Feeds and Blogs"; |
|
$r->print(&Apache::loncommon::start_page($title,undef, |
{'domain' => $udom, |
{'domain' => $udom, |
'force_register' => |
'force_register' => |
$env{'form.register'}}). |
$env{'form.register'}}). |
Line 337 sub handler {
|
Line 339 sub handler {
|
&editentry($id,$uname,$udom,$feedname, |
&editentry($id,$uname,$udom,$feedname, |
$env{'form.'.$id.'_title'}, |
$env{'form.'.$id.'_title'}, |
$env{'form.'.$id.'_description'}, |
$env{'form.'.$id.'_description'}, |
$env{'form.'.$id.'_url'}, |
$env{'form.'.$id.'_link'}, |
$env{'form.'.$id.'_status'}, |
$env{'form.'.$id.'_status'}, |
$env{'form.'.$id.'_enclosureurl'}, |
$env{'form.'.$id.'_enclosureurl'}, |
$env{'form.'.$id.'_enclosuretype'}, |
$env{'form.'.$id.'_enclosuretype'}, |
Line 400 ENDEDIT
|
Line 402 ENDEDIT
|
} else { # not in edit mode, just displaying |
} else { # not in edit mode, just displaying |
if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; } |
if (($newsfeed{$id.'_status'} ne 'public') && ($viewpubliconly)) { next; } |
if ($newsfeed{$id.'_status'} eq 'hidden') { next; } |
if ($newsfeed{$id.'_status'} eq 'hidden') { next; } |
|
my $link = $newsfeed{$id.'_link'}; |
|
if ($link =~ m|^/| ) { |
|
$link = "http://".$ENV{'HTTP_HOST'}.$link; |
|
} |
$r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}. |
$r->print("\n".($html?"\n<li><b>":"<item>\n<title>").$newsfeed{$id.'_title'}. |
($html?"</b><br />\n":"</title>\n<description>"). |
($html?"</b><br />\n":"</title>\n<description>"). |
$newsfeed{$id.'_description'}. |
$newsfeed{$id.'_description'}. |
($html?"<br />\n<a href='":"</description>\n<link>"). |
($html?"<br />\n<a href='":"</description>\n<link>"). |
"http://".$ENV{'HTTP_HOST'}. |
|
$newsfeed{$id.'_link'}. |
$link. |
($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n")); |
($html?("'>".&mt('Read more')."</a><br />\n"):"</link>\n")); |
# Enclosure? Get stats |
# Enclosure? Get stats |
if ($newsfeed{$id.'_enclosureurl'}) { |
if ($newsfeed{$id.'_enclosureurl'}) { |