version 1.1108, 2013/01/01 19:53:26
|
version 1.1112, 2013/01/18 12:58:42
|
Line 68 use Apache::loncoursedata();
|
Line 68 use Apache::loncoursedata();
|
use Apache::lontexconvert(); |
use Apache::lontexconvert(); |
use Apache::lonclonecourse(); |
use Apache::lonclonecourse(); |
use Apache::lonuserutils(); |
use Apache::lonuserutils(); |
|
use Apache::lonuserstate(); |
use LONCAPA qw(:DEFAULT :match); |
use LONCAPA qw(:DEFAULT :match); |
use DateTime::TimeZone; |
use DateTime::TimeZone; |
use DateTime::Locale::Catalog; |
use DateTime::Locale::Catalog; |
Line 992 sub select_language {
|
Line 993 sub select_language {
|
my ($name,$selected,$includeempty) = @_; |
my ($name,$selected,$includeempty) = @_; |
my %langchoices; |
my %langchoices; |
if ($includeempty) { |
if ($includeempty) { |
%langchoices = ('' => 'No language preference'); |
%langchoices = ('' => &mt('No language preference')); |
} |
} |
foreach my $id (&languageids()) { |
foreach my $id (&languageids()) { |
my $code = &supportedlanguagecode($id); |
my $code = &supportedlanguagecode($id); |
Line 11625 sub cleanup_empty_dirs {
|
Line 11626 sub cleanup_empty_dirs {
|
my $numitems = 0; |
my $numitems = 0; |
foreach my $item (@dircontents) { |
foreach my $item (@dircontents) { |
if (-d "$path/$item") { |
if (-d "$path/$item") { |
&recurse_dirs("$path/$item"); |
&cleanup_empty_dirs("$path/$item"); |
if (-e "$path/$item") { |
if (-e "$path/$item") { |
$numitems ++; |
$numitems ++; |
} |
} |
Line 14144 sub update_content_constraints {
|
Line 14145 sub update_content_constraints {
|
return; |
return; |
} |
} |
|
|
|
sub allmaps_incourse { |
|
my ($cdom,$cnum,$chome,$cid) = @_; |
|
if ($cdom eq '' || $cnum eq '' || $chome eq '' || $cid eq '') { |
|
$cid = $env{'request.course.id'}; |
|
$cdom = $env{'course.'.$cid.'.domain'}; |
|
$cnum = $env{'course.'.$cid.'.num'}; |
|
$chome = $env{'course.'.$cid.'.home'}; |
|
} |
|
my %allmaps = (); |
|
my $lastchange = |
|
&Apache::lonnet::get_coursechange($cdom,$cnum); |
|
if ($lastchange > $env{'request.course.tied'}) { |
|
my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum"); |
|
unless ($ferr) { |
|
&update_content_constraints($cdom,$cnum,$chome,$cid); |
|
} |
|
} |
|
my $navmap = Apache::lonnavmaps::navmap->new(); |
|
if (defined($navmap)) { |
|
foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) { |
|
$allmaps{$res->src()} = 1; |
|
} |
|
} |
|
return \%allmaps; |
|
} |
|
|
sub parse_supplemental_title { |
sub parse_supplemental_title { |
my ($title) = @_; |
my ($title) = @_; |
|
|
Line 14353 sub check_captcha {
|
Line 14380 sub check_captcha {
|
output_folder => $captcha_params{'output_dir'}, |
output_folder => $captcha_params{'output_dir'}, |
data_folder => $captcha_params{'db_dir'}, |
data_folder => $captcha_params{'db_dir'}, |
); |
); |
my $captcha_chk = $captcha->check_code($code,$md5sum); |
$captcha_chk = $captcha->check_code($code,$md5sum); |
my %captcha_hash = ( |
my %captcha_hash = ( |
0 => 'Code not checked (file error)', |
0 => 'Code not checked (file error)', |
-1 => 'Failed: code expired', |
-1 => 'Failed: code expired', |