[LON-CAPA-cvs] cvs: loncom /interface lonbulletin.pm lonfeedback.pm

Mon, 24 Nov 2003 16:00:45 -0000

www		Mon Nov 24 11:00:45 2003 EDT

  Modified files:              
    /loncom/interface	lonbulletin.pm lonfeedback.pm 
  Log:
  Bug #2321: Bulletin Board was framed, conflict in non-remote mode.
  
  
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.17 loncom/interface/lonbulletin.pm:1.18

--- loncom/interface/lonbulletin.pm:1.17	Mon Sep 29 12:09:20 2003
+++ loncom/interface/lonbulletin.pm	Mon Nov 24 11:00:45 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.17 2003/09/29 16:09:20 www Exp $
+# $Id: lonbulletin.pm,v 1.18 2003/11/24 16:00:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,7 @@
     }
     $r->print(&Apache::lonfeedback::list_discussion
 	      ('board','OPEN','bulletin___'.$marker.'___'.
-	       'adm/wrapper'.$r->uri).'</body></html>');
+	       $r->uri).'</body></html>');
     return OK;
 } 
 
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.69 loncom/interface/lonfeedback.pm:1.70
--- loncom/interface/lonfeedback.pm:1.69	Fri Nov  7 16:21:17 2003
+++ loncom/interface/lonfeedback.pm	Mon Nov 24 11:00:45 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.69 2003/11/07 21:21:17 www Exp $
+# $Id: lonfeedback.pm,v 1.70 2003/11/24 16:00:45 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -327,6 +327,7 @@
 
 sub fail_redirect {
   my ($r,$feedurl) = @_;
+  if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   $r->print (<<ENDFAILREDIR);
 <head><title>Feedback not sent</title>
 <meta http-equiv="pragma" content="no-cache" />
@@ -343,6 +344,7 @@
 
 sub redirect_back {
   my ($r,$feedurl,$typestyle,$sendsomething,$sendposts,$status) = @_;
+  if ($feedurl=~/^\/adm\//) { $feedurl.='?register=1' };
   $r->print (<<ENDREDIR);
 <head>
 <title>Feedback sent</title>



