[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm /xml lonxml.pm
albertel
lon-capa-cvs@mail.lon-capa.org
Thu, 20 Apr 2006 02:58:18 -0000
albertel Wed Apr 19 22:58:18 2006 EDT
Modified files:
/loncom/xml lonxml.pm
/loncom/interface lonmenu.pm
Log:
- moving this global from lonxml into the session environment
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.410 loncom/xml/lonxml.pm:1.411
--- loncom/xml/lonxml.pm:1.410 Tue Apr 18 18:35:55 2006
+++ loncom/xml/lonxml.pm Wed Apr 19 22:58:14 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# XML Parser Module
#
-# $Id: lonxml.pm,v 1.410 2006/04/18 22:35:55 albertel Exp $
+# $Id: lonxml.pm,v 1.411 2006/04/20 02:58:14 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -123,9 +123,6 @@
# stores the list of active tag namespaces
@namespace=();
-# has the dynamic menu been updated to know about this resource
-$Apache::lonxml::registered=0;
-
# a pointer the the Apache request object
$Apache::lonxml::request='';
@@ -603,7 +600,6 @@
sub setup_globals {
my ($request,$target)=@_;
$Apache::lonxml::request=$request;
- $Apache::lonxml::registered = 0;
$errorcount=0;
$warningcount=0;
$Apache::lonxml::default_homework_loaded=0;
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.173 loncom/interface/lonmenu.pm:1.174
--- loncom/interface/lonmenu.pm:1.173 Fri Apr 14 16:12:35 2006
+++ loncom/interface/lonmenu.pm Wed Apr 19 22:58:17 2006
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.173 2006/04/14 20:12:35 albertel Exp $
+# $Id: lonmenu.pm,v 1.174 2006/04/20 02:58:17 albertel Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -310,7 +310,7 @@
'<script type="text/javascript">function LONCAPAreg(){;} function LONCAPAstale(){}</script>'.$force_title;
}
# Graphical display after login only
- if ($Apache::lonxml::registered && !$forcereg) { return ''; }
+ if ($env{'request.registered'} && !$forcereg) { return ''; }
$result.=&innerregister($forcereg);
return $result.$force_title;
}
@@ -327,7 +327,7 @@
if ($env{'request.noversionuri'} eq '/res/adm/pages/menu.html') { return ''; }
- $Apache::lonxml::registered=1;
+ $env{'request.registered'} = 1;
my $textinter=($env{'browser.interface'} eq 'textual');
my $noremote=($env{'environment.remote'} eq 'off');