[LON-CAPA-cvs] cvs: rat / lonuserstate.pm loncom/auth lonacc.pm

[www]

www		Fri Feb 28 13:14:44 2003 EDT

  Modified files:              
    /loncom/auth	lonacc.pm 
    /rat	lonuserstate.pm 
  Log:
  Still working on running syllabus, etc, without /adm/wrapper.
  
  
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.38 loncom/auth/lonacc.pm:1.39
--- loncom/auth/lonacc.pm:1.38	Mon Feb  3 13:03:52 2003
+++ loncom/auth/lonacc.pm	Fri Feb 28 13:14:44 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.38 2003/02/03 18:03:52 harris41 Exp $
+# $Id: lonacc.pm,v 1.39 2003/02/28 18:14:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -176,7 +176,9 @@
           if ($ENV{'request.course.id'}) {
 	    &Apache::lonnet::countacc($requrl);
             $requrl=~/\.(\w+)$/;
-            if (&Apache::loncommon::fileembstyle($1) eq 'ssi') {
+            if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
+ ($requrl=~/^\/adm\/(aboutme|navmaps|smppg|bulletinboard|wrapper)/) ||
+ ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $query=$r->args;
                 my $symb;
Index: rat/lonuserstate.pm
diff -u rat/lonuserstate.pm:1.52 rat/lonuserstate.pm:1.53
--- rat/lonuserstate.pm:1.52	Fri Feb 28 11:17:00 2003
+++ rat/lonuserstate.pm	Fri Feb 28 13:14:44 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construct and maintain state and binary representation of course for user
 #
-# $Id: lonuserstate.pm,v 1.52 2003/02/28 16:17:00 www Exp $
+# $Id: lonuserstate.pm,v 1.53 2003/02/28 18:14:44 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -139,19 +139,24 @@
 				$turi='/adm/coursedocs/showdoc'.$turi;
                             }
                         } else { # normal internal resource
-                           if (($embstyle eq 'img') || ($embstyle eq 'emb')
-             || ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/)) {
-			       $turi=$turi.'?register=1';
+                           if (($embstyle eq 'img') || ($embstyle eq 'emb')) {
+			       $turi='/adm/wrapper'.$turi;
                            }
                         }
 		    }
-                    $hash{'src_'.$rid}=$turi;
 
                     if (defined($hash{'ids_'.$turi})) {
                         $hash{'ids_'.$turi}.=','.$rid;
                     } else {
                         $hash{'ids_'.$turi}=''.$rid;
                     }
+               
+                    if
+	        ($turi=~/\/(syllabus|aboutme|navmaps|smppg|bulletinboard)$/) {
+			$turi.='?register=1';
+		    }
+
+                    $hash{'src_'.$rid}=$turi;
 
                     if ($token->[2]->{'external'} eq 'true') {
                         $hash{'ext_'.$rid}='true:';