loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

version 1.519, 2007/04/05 21:36:15	version 1.520, 2007/04/10 20:05:21
Line 3248 sub domainlogo {	Line 3248 sub domainlogo {
# See if there is a logo	# See if there is a logo
if ($designhash{$domain.'.login.domlogo'} ne '') {	if ($designhash{$domain.'.login.domlogo'} ne '') {
my $imgsrc = $designhash{$domain.'.login.domlogo'};	my $imgsrc = $designhash{$domain.'.login.domlogo'};
if ($imgsrc =~ /^\/adm/) {	if ($imgsrc =~ /^\/(adm\|res)/) {
$imgsrc = &lonhttpdurl($imgsrc);	$imgsrc = &lonhttpdurl($imgsrc);
}	}
return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';	return '<img src="'.$imgsrc.'" alt="'.$domain.'" />';
Line 3290 sub designparm {	Line 3290 sub designparm {
}	}
$domain=&determinedomain($domain);	$domain=&determinedomain($domain);
my %domdesign = &get_domainconf($domain);	my %domdesign = &get_domainconf($domain);
	my $output;
if ($domdesign{$domain.'.'.$which} ne '') {	if ($domdesign{$domain.'.'.$which} ne '') {
return $domdesign{$domain.'.'.$which};	$output = $domdesign{$domain.'.'.$which};
} else {	} else {
return $defaultdesign{$which};	$output = $defaultdesign{$which};
}	}
	if (($which =~ /^(student\|coordinator\|author\|admin)\.img$/) \|\|
	($which =~ /login\.(img\|logo\|domlogo)/)) {
	if ($output =~ /^\/(adm\|res)\//) {
	$output = &lonhttpdurl($output);
	}
	}
	return $output;
}	}

###############################################	###############################################