version 1.47, 2006/08/10 21:46:40
|
version 1.48, 2006/08/10 22:05:18
|
Line 945 your changes.</td>
|
Line 945 your changes.</td>
|
my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom); |
my ($result,$perm_reqd)=&Apache::lonnet::auto_photo_permission($crs,$dom); |
my $can_enable = 1; |
my $can_enable = 1; |
my $institution = $Apache::lonnet::domaindescription{$dom}; |
my $institution = $Apache::lonnet::domaindescription{$dom}; |
my $user; |
|
if ($enrollvar{'courseowner'} =~ /^[^:]+:[^:]+$/) { |
|
$user = $env{'user.name'}.':'.$env{'user.domain'}; |
|
} else { |
|
$user = $env{'user.name'}; |
|
} |
|
if ($result eq 'ok') { |
if ($result eq 'ok') { |
if ($perm_reqd eq 'yes') { |
if ($perm_reqd eq 'yes') { |
if (!($enrollvar{'photopermission'} eq 'yes')) { |
if (!($enrollvar{'photopermission'} eq 'yes')) { |
$can_enable = 0; |
$can_enable = 0; |
} else { |
} else { |
if ($user eq $enrollvar{'courseowner'}) { |
if (&user_is_courseowner($enrollvar{'courseowner'})) { |
$r->print(' |
$r->print(' |
<tr> |
<tr> |
<td>'. |
<td>'. |
Line 989 your changes.</td>
|
Line 983 your changes.</td>
|
</tr> |
</tr> |
'); |
'); |
} else { |
} else { |
if ($user eq $enrollvar{'courseowner'}) { |
if (&user_is_courseowner($enrollvar{'courseowner'})) { |
$r->print(' |
$r->print(' |
<tr> |
<tr> |
<td>'. |
<td>'. |
Line 2283 sub photo_permission {
|
Line 2277 sub photo_permission {
|
$dom,$crs); |
$dom,$crs); |
my ($showphotos,$response); |
my ($showphotos,$response); |
if (exists($env{'form.cancel_agreement'})) { |
if (exists($env{'form.cancel_agreement'})) { |
if ($env{'user.name'} eq $settings{'internal.courseowner'}) { |
if (&user_is_courseowner($settings{'internal.courseowner'})) { |
my %cenv = ( |
my %cenv = ( |
'internal.photopermission' => 'no', |
'internal.photopermission' => 'no', |
); |
); |
Line 2353 sub print_photo_agreement {
|
Line 2347 sub print_photo_agreement {
|
my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_; |
my ($r,$realm,$dom,$crs,$action,$tasktitleref,$conditions,$courseowner)=@_; |
my $response; |
my $response; |
my $institution = $Apache::lonnet::domaindescription{$dom}; |
my $institution = $Apache::lonnet::domaindescription{$dom}; |
if ($env{'user.name'} eq $courseowner) { |
if (&user_is_courseowner($courseowner)) { |
$response = ' |
$response = ' |
<script type="text/javascript"> |
<script type="text/javascript"> |
function agreement_result(caller) { |
function agreement_result(caller) { |
Line 2984 sub validate_lcsec {
|
Line 2978 sub validate_lcsec {
|
return 'ok'; |
return 'ok'; |
} |
} |
|
|
|
sub user_is_courseowner { |
|
my ($courseowner) = @_; |
|
my $user; |
|
if ($courseowner =~ /^[^:]+:[^:]+$/) { |
|
$user = $env{'user.name'}.':'.$env{'user.domain'}; |
|
} else { |
|
$user = $env{'user.name'}; |
|
} |
|
return ($user eq $courseowner); |
|
} |
|
|
################################################################### |
################################################################### |
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |