loncom/interface/londocs.pm - diff

Return to londocs.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/londocs.pm between versions 1.575 and 1.582

version 1.575, 2013/12/31 13:38:31	version 1.582, 2014/06/16 00:09:31
Line 46 use Apache::lonsimplepage();	Line 46 use Apache::lonsimplepage();
use HTML::Entities;	use HTML::Entities;
use HTML::TokeParser;	use HTML::TokeParser;
use GDBM_File;	use GDBM_File;
	use File::MMagic;
use Apache::lonlocal;	use Apache::lonlocal;
use Cwd;	use Cwd;
use LONCAPA qw(:DEFAULT :match);	use LONCAPA qw(:DEFAULT :match);
Line 301 ENDJS	Line 302 ENDJS
if ($contents{content}) {	if ($contents{content}) {
$content .= '	$content .= '
<div class="LC_Box">	<div class="LC_Box">
<h4 class="LC_hcell">Content</h4>'.	<h4 class="LC_hcell">'.&mt('Content').'</h4>'.
$contents{content}.'	$contents{content}.'
</div>';	</div>';
}	}
if ($contents{webreferences}) {	if ($contents{webreferences}) {
$content .= '	$content .= '
<div class="LC_Box">	<div class="LC_Box">
<h4 class="LC_hcell">Web References</h4>'.	<h4 class="LC_hcell">'.&mt('Web References').'</h4>'.
$contents{webreferences}.'	$contents{webreferences}.'
</div>';	</div>';
}	}
Line 1087 sub update_paste_buffer {	Line 1088 sub update_paste_buffer {
}	}
&Apache::lonnet::appenv(\%addtoenv);	&Apache::lonnet::appenv(\%addtoenv);
delete($env{'form.markcopy'});	delete($env{'form.markcopy'});
	return;
}	}

sub recurse_uploaded_maps {	sub recurse_uploaded_maps {
Line 3173 sub process_file_upload {	Line 3175 sub process_file_upload {
my $quotatype = 'unofficial';	my $quotatype = 'unofficial';
if ($crstype eq 'Community') {	if ($crstype eq 'Community') {
$quotatype = 'community';	$quotatype = 'community';
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.instcode'}) {	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.coursecode'}) {
$quotatype = 'official';	$quotatype = 'official';
} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {	} elsif ($env{'course.'.$coursedom.'_'.$coursenum.'.internal.textbook'}) {
$quotatype = 'textbook';	$quotatype = 'textbook';
Line 3181 sub process_file_upload {	Line 3183 sub process_file_upload {
if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {	if (&Apache::loncommon::get_user_quota($coursenum,$coursedom,'course',$quotatype)) {
$filesize = int($filesize/1000); #expressed in kb	$filesize = int($filesize/1000); #expressed in kb
$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',	$$upload_output = &Apache::loncommon::excess_filesize_warning($coursenum,$coursedom,'course',
$env{'form.uploaddoc.filename'},$filesize,'upload');	$env{'form.uploaddoc.filename'},$filesize,
	'upload',$quotatype);
return if ($$upload_output);	return if ($$upload_output);
}	}
my ($parseaction,$showupload,$nextphase,$mimetype);	my ($parseaction,$showupload,$nextphase,$mimetype);
Line 3279 sub process_file_upload {	Line 3282 sub process_file_upload {
$$upload_output .= &mt('No embedded items identified').'<br />';	$$upload_output .= &mt('No embedded items identified').'<br />';
}	}
$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';	$$upload_output = '<div id="uploadfileresult">'.$$upload_output.'</div>';
} elsif (&Apache::loncommon::is_archive_file($mimetype)) {	} elsif ((&Apache::loncommon::is_archive_file($mimetype)) &&
	($env{'form.uploaddoc.filename'} =~ /\.(zip\|tar\|bz2\|gz\|tar.gz\|tar.bz2\|tgz)$/i)) {
$nextphase = 'decompress_uploaded';	$nextphase = 'decompress_uploaded';
my $position = scalar(@LONCAPA::map::order)-1;	my $position = scalar(@LONCAPA::map::order)-1;
my $noextract = &return_to_editor();	my $noextract = &return_to_editor();
Line 3341 sub is_supplemental_title {	Line 3345 sub is_supplemental_title {
sub entryline {	sub entryline {
my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,	my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$coursedom,
$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;	$crstype,$pathitem,$supplementalflag,$container,$filtersref,$currgroups)=@_;
my ($foldertitle,$renametitle);	my ($foldertitle,$renametitle,$oldtitle);
if (&is_supplemental_title($title)) {	if (&is_supplemental_title($title)) {
($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
} else {	} else {
Line 3355 sub entryline {	Line 3359 sub entryline {
$renametitle=~s/\\/\\\\/g;	$renametitle=~s/\\/\\\\/g;
$renametitle=~s/\&quot\;/\\\"/g;	$renametitle=~s/\&quot\;/\\\"/g;
$renametitle=~s/ /%20/g;	$renametitle=~s/ /%20/g;
	$oldtitle = $renametitle;
	$renametitle=~s/\'/\\\'/g;
my $line=&Apache::loncommon::start_data_table_row();	my $line=&Apache::loncommon::start_data_table_row();
my ($form_start,$form_end,$form_common,$form_param);	my ($form_start,$form_end,$form_common,$form_param);
# Edit commands	# Edit commands
Line 3504 ENDREM	Line 3510 ENDREM
}	}
}	}
$renamelink=(<<ENDREN);	$renamelink=(<<ENDREN);
<a href='javascript:changename("$esc_path","$index","$renametitle");' class="LC_docs_rename">$lt{'rn'}</a>	<a href='javascript:changename("$esc_path","$index","$oldtitle");' class="LC_docs_rename">$lt{'rn'}</a>
ENDREN	ENDREN
$line.=(<<END);	$line.=(<<END);
<td>	<td>
Line 4500 sub handler {	Line 4506 sub handler {
$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});	$allowed = &Apache::lonnet::allowed('mdc',$env{'request.course.id'});
}	}

&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['chooseserver',	&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['inhibitmenu']);
'inhibitmenu']);	if ($allowed && $env{'form.verify'}) {
if ($allowed && $env{'form.chooseserver'}) {
&choose_dump_server($r);
return OK;
} elsif ($allowed && $env{'form.verify'}) {
&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');	&init_breadcrumbs('verify','Verify Content','Docs_Verify_Content');
&verifycontent($r);	&verifycontent($r);
} elsif ($allowed && $env{'form.listsymbs'}) {	} elsif ($allowed && $env{'form.listsymbs'}) {
Line 4847 sub handler {	Line 4849 sub handler {
'title' => 'Title',	'title' => 'Title',
'comment' => 'Comment',	'comment' => 'Comment',
'parse' => 'Upload embedded images/multimedia files if HTML file',	'parse' => 'Upload embedded images/multimedia files if HTML file',
);	'bb5' => 'Blackboard 5',
	'bb6' => 'Blackboard 6',
	'angel5' => 'ANGEL 5.5',
	'webctce4' => 'WebCT 4 Campus Edition',
	);
# -----------------------------------------------------------------------------	# -----------------------------------------------------------------------------
my $fileupload=(<<FIUP);	my $fileupload=(<<FIUP);
$lt{'file'}:<br />	$lt{'file'}:<br />
Line 4878 CHBO	Line 4884 CHBO
$lt{'cms'}:	$lt{'cms'}:
<select name="source">	<select name="source">
<option value="-1" selected="selected">$lt{'se'}</option>	<option value="-1" selected="selected">$lt{'se'}</option>
<option value="bb5">Blackboard 5</option>	<option value="bb5">$lt{'bb5'}</option>
<option value="bb6">Blackboard 6</option>	<option value="bb6">$lt{'bb6'}</option>
<option value="angel5">ANGEL 5.5</option>	<option value="angel5">$lt{'angel5'}</option>
<option value="webctce4">WebCT 4 Campus Edition</option>	<option value="webctce4">$lt{'webctce4'}</option>
</select>	</select>
<input type="hidden" name="folder" value="$imsfolder" />	<input type="hidden" name="folder" value="$imsfolder" />
</p>	</p>

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.575
changed lines
	Added in v.1.582