version 1.68.6.1, 2012/05/02 19:10:13
|
version 1.68.6.2, 2012/06/04 02:17:35
|
Line 181 sub readfromfile {
|
Line 181 sub readfromfile {
|
} |
} |
} |
} |
|
|
# --------------------------------------------------------- Read from bookmarks |
|
|
|
sub readfrombookmarks { |
|
my ($r,$resources)=@_; |
|
my %bookmarks=&Apache::lonnet::dump('bookmarks'); |
|
# the bookmark "hash" is just one entry |
|
# it's a javascript program code with arguments like ('title','url'); |
|
my @bookmarks=($bookmarks{'bookmarks'}=~/\((?:\'([^\']+)\'\,\'([^\']+)\'|\"([^\"]+)\"\,\"([^\"]+)\")\)\;/g); |
|
for (my $index=0;$index<($#bookmarks+1)/2;$index++) { |
|
if ($bookmarks[$index*2+1]) { |
|
my $url = $bookmarks[$index*2+1]; |
|
my $name = $bookmarks[$index*2]; |
|
$name =~ s/^LON\-CAPA\s+//; |
|
|
|
push(@{$resources},{'url' => $url, 'title' => $name}); |
|
} |
|
} |
|
} |
|
|
|
# ---------------------------------------------------------------- Main Handler |
# ---------------------------------------------------------------- Main Handler |
sub handler { |
sub handler { |
my $r = shift; |
my $r = shift; |
|
|
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
&Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'}, |
['acts','mode','readfile','recover','bookmarks']); |
['acts','mode','readfile','recover']); |
|
|
&Apache::loncommon::content_type($r,'text/html'); |
&Apache::loncommon::content_type($r,'text/html'); |
$r->send_http_header; |
$r->send_http_header; |
Line 215 sub handler {
|
Line 197 sub handler {
|
my $finishimport=''; |
my $finishimport=''; |
my $begincondition=''; |
my $begincondition=''; |
my $endcondition=''; |
my $endcondition=''; |
if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
if (($env{'form.readfile'})) { |
$begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {'; |
$begincondition='if (eval("document.forms.groupsort.include"+num+".checked")) {'; |
$endcondition='}'; |
$endcondition='}'; |
} |
} |
Line 299 END
|
Line 281 END
|
|
|
if ($env{'form.readfile'}) { |
if ($env{'form.readfile'}) { |
&readfromfile($r,\@resources); |
&readfromfile($r,\@resources); |
} elsif ($env{'form.bookmarks'}) { |
|
&readfrombookmarks($r,\@resources); |
|
} else { |
} else { |
&readfromdb($r,\@resources); |
&readfromdb($r,\@resources); |
} |
} |
Line 313 END
|
Line 293 END
|
} else { |
} else { |
$title = 'Sort Imported Resources'; |
$title = 'Sort Imported Resources'; |
} |
} |
if ($env{'form.bookmarks'}) { |
if (($clen > 1) || ($env{'form.readfile'})) { |
$title = 'Import Resources from Bookmarks'; |
|
} |
|
if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
|
my %lt=&Apache::lonlocal::texthash( |
my %lt=&Apache::lonlocal::texthash( |
'fin'=> 'Finalize order of resources', |
'fin'=> 'Finalize order of resources', |
'ci' => 'Continue Import', |
'ci' => 'Continue Import', |
Line 342 END
|
Line 319 END
|
<input type="hidden" name="newval" value="" /> |
<input type="hidden" name="newval" value="" /> |
<input type="hidden" name="mode" value="$env{'form.mode'}" /> |
<input type="hidden" name="mode" value="$env{'form.mode'}" /> |
<input type="hidden" name="readfile" value="$env{'form.readfile'}" /> |
<input type="hidden" name="readfile" value="$env{'form.readfile'}" /> |
<input type="hidden" name="bookmarks" value="$env{'form.bookmarks'}" /> |
|
<input type="hidden" name="recover" value="$env{'form.recover'}" /> |
<input type="hidden" name="recover" value="$env{'form.recover'}" /> |
END |
END |
|
|
Line 350 END
|
Line 326 END
|
# --- |
# --- |
|
|
my $buttontext = $lt{'re'}; |
my $buttontext = $lt{'re'}; |
if ($env{'form.bookmarks'}) { |
if ($env{'form.recover'}) { |
$buttontext = $lt{'ip'} |
|
} |
|
if ($env{'form.recover'} || $env{'form.bookmarks'}) { |
|
$r->print(<<END); |
$r->print(<<END); |
<input type="button" name="alter" value="$buttontext" |
<input type="button" name="alter" value="$buttontext" |
onClick="finish_import()" /> |
onClick="finish_import()" /> |
Line 397 END
|
Line 370 END
|
} else { |
} else { |
$errtxt = 'There are no resources to import.'; |
$errtxt = 'There are no resources to import.'; |
} |
} |
if ($env{'form.bookmarks'}) { |
|
$errtxt = 'There are no resources in your bookmarks to import.'; |
|
} |
|
$r->print('<p class="LC_info">'.&mt($errtxt).'</p>'); |
$r->print('<p class="LC_info">'.&mt($errtxt).'</p>'); |
} |
} |
} else { |
} else { |
Line 420 END
|
Line 390 END
|
foreach my $resource (@resources) { |
foreach my $resource (@resources) { |
$ctr++; |
$ctr++; |
my $iconname=&Apache::loncommon::icon($resource->{'url'}); |
my $iconname=&Apache::loncommon::icon($resource->{'url'}); |
if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
if (($clen > 1) || ($env{'form.readfile'})) { |
$r->print(&Apache::loncommon::start_data_table_row() |
$r->print(&Apache::loncommon::start_data_table_row() |
."<td>"); |
."<td>"); |
if (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
if (($env{'form.readfile'})) { |
$r->print(&checkbox($ctr-1)); |
$r->print(&checkbox($ctr-1)); |
} else { |
} else { |
$r->print(&movers($clen,$ctr)); |
$r->print(&movers($clen,$ctr)); |
Line 431 END
|
Line 401 END
|
} |
} |
$r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'}, |
$r->print(&hidden($ctr-1,$resource->{'title'},$resource->{'url'}, |
$resource->{'id'})); |
$resource->{'id'})); |
if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
if (($clen > 1) || ($env{'form.readfile'})) { |
$r->print("</td>"); |
$r->print("</td>"); |
unless (($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
unless (($env{'form.readfile'})) { |
$r->print("<td>". |
$r->print("<td>". |
&select_box($clen,$ctr). |
&select_box($clen,$ctr). |
"</td>"); |
"</td>"); |
Line 447 END
|
Line 417 END
|
."\n"); |
."\n"); |
} |
} |
} |
} |
if (($clen > 1) || ($env{'form.readfile'}) || ($env{'form.bookmarks'})) { |
if (($clen > 1) || ($env{'form.readfile'})) { |
if ($clen > 0) { |
if ($clen > 0) { |
$r->print(&Apache::loncommon::end_data_table()); |
$r->print(&Apache::loncommon::end_data_table()); |
} |
} |