version 1.26, 2005/02/09 21:21:08
|
version 1.27, 2005/02/21 17:23:32
|
Line 35 use POSIX qw(strftime mktime);
|
Line 35 use POSIX qw(strftime mktime);
|
|
|
my $mysqluser; |
my $mysqluser; |
my $mysqlpassword; |
my $mysqlpassword; |
|
my $mysqldatabase; |
|
|
sub set_mysql_user_and_password { |
sub set_mysql_user_and_password { |
# If we are running under Apache and LONCAPA, use the LON-CAPA |
# If we are running under Apache and LONCAPA, use the LON-CAPA |
# user and password. Otherwise...? ? ? ? |
# user and password. Otherwise...? ? ? ? |
($mysqluser,$mysqlpassword) = @_; |
my ($input_mysqluser,$input_mysqlpassword,$input_mysqldatabase) = @_; |
|
if (! defined($mysqldatabase)) { |
|
$mysqldatabase = 'loncapa'; |
|
} |
|
if (defined($input_mysqldatabase)) { |
|
$mysqldatabase = $input_mysqldatabase; |
|
} |
if (! defined($mysqluser) || ! defined($mysqlpassword)) { |
if (! defined($mysqluser) || ! defined($mysqlpassword)) { |
if (! eval 'require Apache::lonnet();') { |
if (! eval 'require Apache::lonnet();') { |
$mysqluser = 'www'; |
$mysqluser = 'www'; |
Line 49 sub set_mysql_user_and_password {
|
Line 56 sub set_mysql_user_and_password {
|
$mysqlpassword = ''; |
$mysqlpassword = ''; |
} |
} |
} |
} |
|
if (defined($input_mysqluser)) { |
|
$mysqluser = $input_mysqluser; |
|
} |
|
if (defined($input_mysqlpassword)) { |
|
$mysqlpassword = $input_mysqlpassword; |
|
} |
} |
} |
|
|
###################################################################### |
###################################################################### |
Line 349 sub connect_to_db {
|
Line 362 sub connect_to_db {
|
if (! defined($mysqluser) || ! defined($mysqlpassword)) { |
if (! defined($mysqluser) || ! defined($mysqlpassword)) { |
&set_mysql_user_and_password(); |
&set_mysql_user_and_password(); |
} |
} |
if (! ($dbh = DBI->connect("DBI:mysql:loncapa",$mysqluser,$mysqlpassword, |
if (! ($dbh = DBI->connect("DBI:mysql:$mysqldatabase",$mysqluser,$mysqlpassword, |
{ RaiseError=>0,PrintError=>0}))) { |
{ RaiseError=>0,PrintError=>0}))) { |
$debugstring = "Unable to connect to loncapa database."; |
$debugstring = "Unable to connect to loncapa database."; |
if (! defined($dbh)) { |
if (! defined($dbh)) { |