[LON-CAPA-cvs] cvs: loncom / loncron

[harris41]

harris41		Sat May 11 17:18:14 2002 EDT

  Modified files:              
    /loncom	loncron 
  Log:
  using LONCAPA::Configuration::read_conf
  BUG 129
  
  
Index: loncom/loncron
diff -u loncom/loncron:1.25 loncom/loncron:1.26
--- loncom/loncron:1.25	Mon Nov 26 16:00:42 2001
+++ loncom/loncron	Sat May 11 17:18:14 2002
@@ -14,9 +14,14 @@
 # YEAR=2001
 # 1/10/2001, 2/12/, 2/26, 3/15, 04/11, 04/21,8/27 Scott Harrison
 # 09/04,09/06,11/26 Gerd Kortemeyer
+# YEAR=2002
+# 5/11/2002 Scott Harrison
 
 $|=1;
 
+use lib '/home/httpd/lib/perl/';
+use LONCAPA::Configuration;
+
 use IO::File;
 use IO::Socket;
 
@@ -50,19 +55,12 @@
 
 # ================================================================ Main Program
 
-# ------------------------------------------------------------ Read access.conf
-{
-    my $config=IO::File->new("/etc/httpd/conf/access.conf");
-
-    while (my $configline=<$config>) {
-        if ($configline =~ /PerlSetVar/) {
-	   my ($dummy,$varname,$varvalue)=split(/\s+/,$configline);
-           $perlvar{$varname}=$varvalue;
-        }
-    }
-    delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
-    delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
-}
+# ------------------------------------------- Read access.conf and loncapa.conf
+my $perlvarref=LONCAPA::Configuration::read_conf('access.conf','loncapa.conf');
+my %perlvar=%{$perlvarref};
+undef $perlvarref;
+delete $perlvar{'lonReceipt'}; # remove since sensitive and not needed
+delete $perlvar{'lonSqlAccess'}; # remove since sensitive and not needed
 
 # --------------------------------------- Make sure that LON-CAPA is configured
 # I only test for one thing here (lonHostID).  This is just a safeguard.