[LON-CAPA-cvs] cvs: loncom / loncapa_apache.conf /auth lonacc.pm roles.tab rolesplain.tab /html/res/adm/pages menu.html /lonnet/perl lonnet.pm

www lon-capa-cvs@mail.lon-capa.org
Sat, 12 Apr 2003 15:58:44 -0000 

www		Sat Apr 12 11:58:44 2003 EDT

  Modified files:              
    /loncom	loncapa_apache.conf 
    /loncom/auth	lonacc.pm roles.tab rolesplain.tab 
    /loncom/html/res/adm/pages	menu.html 
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Install new managekeys handler, make new permission "mky" to invoke it
  
  
Index: loncom/loncapa_apache.conf
diff -u loncom/loncapa_apache.conf:1.43 loncom/loncapa_apache.conf:1.44
--- loncom/loncapa_apache.conf:1.43	Thu Apr  3 09:35:59 2003
+++ loncom/loncapa_apache.conf	Sat Apr 12 11:58:43 2003
@@ -1,7 +1,7 @@
 ##
 ## loncapa_apache.conf -- Apache HTTP LON-CAPA configuration file
 ##
-## $Id: loncapa_apache.conf,v 1.43 2003/04/03 14:35:59 albertel Exp $
+## $Id: loncapa_apache.conf,v 1.44 2003/04/12 15:58:43 www Exp $
 ##
 
 #
@@ -58,7 +58,7 @@
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/+public/.*/syllabus">
+<LocationMatch "^/+public/.*/syllabus$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsyllabus
@@ -66,7 +66,7 @@
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/aboutme">
+<LocationMatch "^/adm/.*/aboutme$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonaboutme
@@ -74,7 +74,7 @@
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/smppg">
+<LocationMatch "^/adm/.*/smppg$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonsimplepage
@@ -82,7 +82,7 @@
 ErrorDocument	  500 /adm/errorhandler
 </LocationMatch>
 
-<LocationMatch "^/adm/.*/bulletinboard">
+<LocationMatch "^/adm/.*/bulletinboard$">
 PerlAccessHandler	Apache::lonacc
 SetHandler              perl-script
 PerlHandler             Apache::lonbulletin
@@ -178,7 +178,7 @@
 PerlHandler Apache::lonsequence
 </LocationMatch>
 
-<LocationMatch "^/(res|\~).*\.meta$>
+<LocationMatch "\.meta$>
 SetHandler perl-script
 PerlHandler Apache::lonmeta
 </LocationMatch>
@@ -483,6 +483,15 @@
 PerlAccessHandler       Apache::lonacc
 SetHandler perl-script
 PerlHandler Apache::londropadd
+ErrorDocument     403 /adm/login
+ErrorDocument     406 /adm/roles
+ErrorDocument	  500 /adm/errorhandler
+</Location>
+
+<Location /adm/managekeys>
+PerlAccessHandler       Apache::lonacc
+SetHandler perl-script
+PerlHandler Apache::lonmanagekeys
 ErrorDocument     403 /adm/login
 ErrorDocument     406 /adm/roles
 ErrorDocument	  500 /adm/errorhandler
Index: loncom/auth/lonacc.pm
diff -u loncom/auth/lonacc.pm:1.42 loncom/auth/lonacc.pm:1.43
--- loncom/auth/lonacc.pm:1.42	Thu Apr  3 16:58:09 2003
+++ loncom/auth/lonacc.pm	Sat Apr 12 11:58:43 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Cookie Based Access Handler
 #
-# $Id: lonacc.pm,v 1.42 2003/04/03 21:58:09 albertel Exp $
+# $Id: lonacc.pm,v 1.43 2003/04/12 15:58:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -177,7 +177,7 @@
 	    &Apache::lonnet::countacc($requrl);
             $requrl=~/\.(\w+)$/;
             if ((&Apache::loncommon::fileembstyle($1) eq 'ssi') ||
- ($requrl=~/^\/adm\/(aboutme|navmaps|smppg|bulletinboard|wrapper)/) ||
+ ($requrl=~/^\/adm\/.*\/(aboutme|navmaps|smppg|bulletinboard|wrapper)(\?|$)/) ||
  ($requrl=~/^\/public\/.*\/syllabus$/)) {
 # ------------------------------------- This is serious stuff, get symb and log
 		my $query=$r->args;
Index: loncom/auth/roles.tab
diff -u loncom/auth/roles.tab:1.19 loncom/auth/roles.tab:1.20
--- loncom/auth/roles.tab:1.19	Mon Mar 31 15:31:39 2003
+++ loncom/auth/roles.tab	Sat Apr 12 11:58:43 2003
@@ -1,6 +1,6 @@
 su:s csu&U:sma:mau:cdc&U:dro
 dc:s bre:sma
-dc:d cli&UIK:cau&U:cdg&UIK:mau:ccc&U:cin&UIK:cta&UIK:cep&UIK:ccr&UIK:cst&UIK:cad&UIK:dro
+dc:d cli&UIK:cau&U:cdg&UIK:mau:ccc&U:cin&UIK:cta&UIK:cep&UIK:ccr&UIK:cst&UIK:cad&UIK:dro:mky
 cc:s bre:sma:mcr
 cc:c cin&IK:cta&IK:cep&IK:ccr&IK:cst&IK:are:cre:ere:vgr:gan:srm:opa:mgr:rin:pch
 in:s sma
Index: loncom/auth/rolesplain.tab
diff -u loncom/auth/rolesplain.tab:1.6 loncom/auth/rolesplain.tab:1.7
--- loncom/auth/rolesplain.tab:1.6	Mon Mar 31 15:31:39 2003
+++ loncom/auth/rolesplain.tab	Sat Apr 12 11:58:43 2003
@@ -38,6 +38,7 @@
 cdg:Grant/revoke role of Domain Guest
 cca:Grant/revoke role of Co-Author
 dro:Delete a role
+mky:Manage access keys
 mcr:Create a Course Custom Role
 mau:Modify authentication mechanism and data for a user
 bre:Browse resources
Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.94 loncom/html/res/adm/pages/menu.html:1.95
--- loncom/html/res/adm/pages/menu.html:1.94	Fri Apr 11 11:28:23 2003
+++ loncom/html/res/adm/pages/menu.html	Sat Apr 12 11:58:43 2003
@@ -4,7 +4,7 @@
 Remote Control
 
 //
-// $Id: menu.html,v 1.94 2003/04/11 15:28:23 albertel Exp $
+// $Id: menu.html,v 1.95 2003/04/12 15:58:43 www Exp $
 //
 // Copyright Michigan State University Board of Trustees
 //
@@ -422,7 +422,7 @@
 function catalog_info() {
    go('');
    w_LONcatInfo_flag=1;
-   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,location=no,menubar=no,toolbar=no');
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"LONcatInfo",'height=320,width=280,resizeable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
 }
 
 function chat_win() {
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.360 loncom/lonnet/perl/lonnet.pm:1.361
--- loncom/lonnet/perl/lonnet.pm:1.360	Thu Apr  3 17:25:49 2003
+++ loncom/lonnet/perl/lonnet.pm	Sat Apr 12 11:58:43 2003
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.360 2003/04/03 22:25:49 albertel Exp $
+# $Id: lonnet.pm,v 1.361 2003/04/12 15:58:43 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -634,7 +634,7 @@
    $ENV{'course.'.$ENV{'request.course.id'}.'.domain'} unless (defined($cdom));
     $cnum=
    $ENV{'course.'.$ENV{'request.course.id'}.'.num'} unless (defined($cnum));
-    unless (&allowed('ccc',$cdom)) { return 0; }
+    unless (&allowed('mky',$cdom)) { return 0; }
     unless (($cdom) && ($cnum)) { return 0; }
     if ($number>10000) { return 0; }
     sleep(2); # make sure don't get same seed twice
@@ -1149,6 +1149,14 @@
     }
 }
 
+sub linklog {
+    my ($from,$to)=@_;
+    $from=&declutter($from);
+    $to=&declutter($to);
+    $accesshash{$from.'___'.$to.'___comefrom'}=1;
+    $accesshash{$to.'___'.$from.'___goto'}=1;
+}
+  
 sub userrolelog {
     my ($trole,$username,$domain,$area,$tstart,$tend)=@_;
     if (($trole=~/^ca/) || ($trole=~/^in/) ||