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

Thu, 11 Nov 2004 22:19:54 -0000

albertel		Thu Nov 11 17:19:54 2004 EDT

  Modified files:              
    /loncom/interface	lonfeedback.pm 
  Log:
  - DISC properly handles encrypturl
  
  
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.128 loncom/interface/lonfeedback.pm:1.129

--- loncom/interface/lonfeedback.pm:1.128	Mon Oct  4 17:35:52 2004
+++ loncom/interface/lonfeedback.pm	Thu Nov 11 17:19:53 2004
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.128 2004/10/04 21:35:52 raeburn Exp $
+# $Id: lonfeedback.pm,v 1.129 2004/11/11 22:19:53 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -99,7 +99,7 @@
             $ressymb=~s|(bulletin___\d+___)|$1adm/wrapper|;
         }
     }
-
+    $ressymb=&Apache::lonenc::check_encrypt($ressymb);
 # Get discussion display settings for this discussion
     my $lastkey = $ressymb.'_lastread';
     my $showkey = $ressymb.'_showonlyunread';
@@ -360,7 +360,7 @@
    }
 </script>
             |;
-	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$symb.'"><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
+	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'"><table bgcolor="#AAAAAA" cellpadding="2" cellspacing="2" border="0">';
 	    $discussion .='<tr><td bgcolor="#DDDDBB" colspan="'.$colspan.'">'.
 		'<table border="0" width="100%" bgcolor="#DDDDBB"><tr>';
 	    if ($visible>2) {
@@ -678,7 +678,7 @@
 	($ENV{'request.course.sec'}?'/'.$ENV{'request.course.sec'}:''))) {
 	    if ($outputtarget ne 'tex') {
 		$discussion.='<table bgcolor="#BBBBBB"><tr><td><a href="/adm/feedback?replydisc='.
-		    $symb.':::" '.$target.'>'.
+		    $ressymb.':::" '.$target.'>'.
 		    '<img src="/adm/lonMisc/chat.gif" border="0" />'.
 		    &mt('Post Discussion').'</a></td></tr></table>';
 	    }
@@ -2049,6 +2049,7 @@
           $sectag = '<input type="hidden" name="sectionpick" value="'.$secpick.'" />';
       }
   }
+  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
   $r->print (<<ENDREDIR);
 <html>
 <head>
@@ -2086,9 +2087,10 @@
 ENDNOREDIR
 
   if ($feedurl!~/^\/adm\/feedback/) { 
-    $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.$feedurl.'">');
+      $r->print('<meta HTTP-EQUIV="Refresh" CONTENT="2; url='.
+		&Apache::lonenc::check_encrypt($feedurl).'">');
   }
-  
+  $feedurl=&Apache::lonenc::check_encrypt($feedurl);
   $r->print (<<ENDNOREDIRTWO);
 </head>
 <body bgcolor="#FFFFFF" onLoad='if (window.name!="loncapaclient") { self.close(); }'>



