X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4dbb09950c9f5596646537c12d991c99086fe7c1..de8868c:/bin/mozilla/bp.pl

diff --git a/bin/mozilla/bp.pl b/bin/mozilla/bp.pl
index 56f886fe1..1d9d79fae 100644
--- a/bin/mozilla/bp.pl
+++ b/bin/mozilla/bp.pl
@@ -31,525 +31,169 @@
 #
 #======================================================================
 
-
 use SL::BP;
+use Data::Dumper;
+use List::Util qw(first);
 
 1;
-# end of main
 
+require "bin/mozilla/common.pl";
 
-sub search {
-  $lxdebug->enter_sub();
+use strict;
 
+# end of main
 
-# $locale->text('Sales Invoices')
-# $locale->text('Packing Lists')
-# $locale->text('Sales Orders')
-# $locale->text('Purchase Orders')
-# $locale->text('Quotations')
-# $locale->text('RFQs')
-# $locale->text('Checks')
-# $locale->text('Receipts')
-
-  # setup customer/vendor selection
-  BP->get_vc(\%myconfig, \%$form);
-  
-  if (@{ $form->{"all_$form->{vc}"} }) { 
-    map { $name .= "<option>$_->{name}--$_->{id}\n" } @{ $form->{"all_$form->{vc}"} };
-    $name = qq|<select name=$form->{vc}><option>\n$name</select>|;
-  } else {
-    $name = qq|<input name=$form->{vc} size=35>|;
-  }
- 
-# $locale->text('Customer')
-# $locale->text('Vendor')
-
-  %label = ( invoice => { title => 'Sales Invoices', name => 'Customer', l_invnumber => 'Y' },
-             packing_list => { title => 'Packing Lists', name => 'Customer', l_invnumber => 'Y' },
-             sales_order => { title => 'Sales Orders', name => 'Customer', l_ordnumber => 'Y' },
-             purchase_order => { title => 'Purchase Orders', name => 'Vendor', l_ordnumber => 'Y' },
-             sales_quotation => { title => 'Quotations', name => 'Customer', l_quonumber => 'Y' },
-             request_quotation => { title => 'RFQs', name => 'Vendor', l_quonumber => 'Y' },
-             check => { title => 'Checks', name => 'Vendor' },
-             receipt => { title => 'Receipts', name => 'Customer' }
-	   );
-
-  $label{invoice}{invnumber} = qq|
-	<tr>
-	  <th align=right nowrap>|.$locale->text('Invoice Number').qq|</th>
-	  <td colspan=3><input name=invnumber size=20></td>
-	</tr>
-|;
-  $label{invoice}{ordnumber} = qq|
-	<tr>
-	  <th align=right nowrap>|.$locale->text('Order Number').qq|</th>
-	  <td colspan=3><input name=ordnumber size=20></td>
-	</tr>
-|;
-  $label{sales_quotation}{quonumber} = qq|
-	<tr>
-	  <th align=right nowrap>|.$locale->text('Quotation Number').qq|</th>
-	  <td colspan=3><input name=quonumber size=20></td>
-	</tr>
-|;
-
-  $label{check}{chknumber} = qq|
-  	<tr>
-	  <th align=right nowrap>|.$locale->text('Reference').qq|</th>
-	  <td colspan=3><input name=chknumber size=20></td>
-	</tr>
-|;
-
-  $label{packing_list}{invnumber} = $label{invoice}{invnumber};
-  $label{packing_list}{ordnumber} = $label{invoice}{ordnumber};
-  $label{sales_order}{ordnumber} = $label{invoice}{ordnumber};
-  $label{purchase_order}{ordnumber} = $label{invoice}{ordnumber};
-  $label{request_quotation}{quonumber} = $label{sales_quotation}{quonumber};
-  $label{receipt}{rctnumber} = $label{check}{chknumber};
-  
-  # do one call to text
-  $form->{title} = $locale->text('Print')." ".$locale->text($label{$form->{type}}{title});
-
-  if ($form->{type} =~ /(check|receipt)/) {
-    if (BP->payment_accounts(\%myconfig, \%$form)) {
-      $account = qq|
-        <tr>
-      	  <th align=right>|.$locale->text('Account').qq|</th>
-|;
-
-      if ($form->{accounts}) {
-	$account .= qq|
-	  <td colspan=3><select name=account>
-|;
-	foreach $ref (@{ $form->{accounts} }) {
-	  $account .= qq|
-          <option>$ref->{accno}--$ref->{description}
-|;
-	}
-
-	$account .= qq|
-          </select>
-|;
-      } else {
-	$account .= qq|
-	  <td colspan=3><input name=account></td>
-|;
+sub assert_bp_access {
+  my %access_map = (
+    'invoice'           => 'invoice_edit',
+    'sales_order'       => 'sales_order_edit',
+    'sales_quotation'   => 'sales_quotation_edit',
+    'purchase_order'    => 'purchase_order_edit',
+    'request_quotation' => 'request_quotation_edit',
+    'check'             => 'cash',
+    'receipt'           => 'cash',
+  );
 
-      }
-      
-      $account .= qq|
-	</tr>
-|;
+  if ($::form->{type} && $access_map{$::form->{type}}) {
+    $::auth->assert($access_map{$::form->{type}});
 
-    }
+  } else {
+    $::auth->assert('DOES_NOT_EXIST');
   }
-  
-    # use JavaScript Calendar or not
-  $form->{jsscript} = $jscalendar;
-  $jsscript = "";    
-  if ($form->{jsscript}) 
-  {
-    # with JavaScript Calendar
-    $button1 = qq|
-       <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}">
-       <input type=button name=transdatefrom id="trigger1" value=|.$locale->text('button').qq|></td>
-      |;
-     $button2 = qq|
-       <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}">
-       <input type=button name=transdateto name=transdateto id="trigger2" value=|.$locale->text('button').qq|></td>
-     |;
-    #write Trigger
-    $jsscript = Form->write_trigger(\%myconfig,"2","transdatefrom","BR","trigger1","transdateto","BL","trigger2");
-   }
-   else
-   {
-      # without JavaScript Calendar
-      $button1 = qq|
-                              <td><input name=transdatefrom id=transdatefrom size=11 title="$myconfig{dateformat}"></td>|;
-      $button2 = qq|
-                              <td><input name=transdateto id=transdateto size=11 title="$myconfig{dateformat}"></td>|;
-    }
- 
-  $form->header;
-  
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<input type=hidden name=vc value=$form->{vc}>
-<input type=hidden name=type value=$form->{type}>
-<input type=hidden name=title value="$form->{title}">
-
-<table width=100%>
-  <tr><th class=listtop>$form->{title}</th></tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>
-      <table>
-	<tr>
-	  <th align=right>Kunde</th>
-	  <td colspan=3>$name</td>
-	</tr>
-	$account
-	$label{$form->{type}}{invnumber}
-	$label{$form->{type}}{ordnumber}
-	$label{$form->{type}}{quonumber}
-	$label{$form->{type}}{chknumber}
-	$label{$form->{type}}{rctnumber}
-	<tr>
-	  <th align=right nowrap>|.$locale->text('From').qq|</th>
-          $button1
-	  <th align=right>|.$locale->text('Bis').qq|</th>
-          $button2
-	</tr>
-	<input type=hidden name=sort value=transdate>
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<input type=hidden name=nextsub value=list_spool>
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
-<br>
-<input class=submit type=submit name=action value="|.$locale->text('Continue').qq|">
-
-</form>
-
-</body>
-
-$jsscript
-
-</html>
-|;
-
-  $lxdebug->leave_sub();
 }
 
+sub search {
+  $::lxdebug->enter_sub;
 
+  assert_bp_access();
 
-sub remove {
-  $lxdebug->enter_sub();
-
-  
-  $selected = 0;
-  
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"checked_$i"}) {
-      $selected = 1;
-      last;
-    }
-  }
-
-  $form->error('Nothing selected!') unless $selected;
- 
-  $form->{title} = $locale->text('Confirm!');
-  
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-|;
-
-  map { delete $form->{$_} } qw(action header);
-  
-  foreach $key (keys %$form) {
-    print qq|<input type=hidden name=$key value="$form->{$key}">\n|;
-  }
-
-  print qq|
-<h2 class=confirm>$form->{title}</h2>
-
-<h4>|.$locale->text('Are you sure you want to remove the marked entries from the queue?').qq|</h4>
-
-<input name=action class=submit type=submit value="|.$locale->text('Yes').qq|">
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
+  # setup customer/vendor selection
+  BP->get_vc(\%::myconfig, $::form);
+
+  my %label = (
+       invoice           => { title => $::locale->text('Sales Invoices'),  invnumber => 1, ordnumber => 1 },
+       sales_order       => { title => $::locale->text('Sales Orders'),    ordnumber => 1, },
+       purchase_order    => { title => $::locale->text('Purchase Orders'), ordnumber => 1, },
+       sales_quotation   => { title => $::locale->text('Quotations'),      quonumber => 1, },
+       request_quotation => { title => $::locale->text('RFQs'),            quonumber => 1, },
+       check             => { title => $::locale->text('Checks'),          chknumber => 1, },
+       receipt           => { title => $::locale->text('Receipts'),        rctnumber => 1, },
+  );
+
+  my $bp_accounts = $::form->{type} =~ /check|receipt/
+                 && BP->payment_accounts(\%::myconfig, $::form);
+
+  $::form->header;
+  print $::form->parse_html_template('bp/search', {
+    label         => \%label,
+    show_accounts => $bp_accounts,
+    account_sub   => sub { ("$_[0]{accno}--$_[0]{description}")x2 },
+    vc_keys       => sub { "$_[0]{name}--$_[0]{id}" },
+  });
+
+  $::lxdebug->leave_sub;
 }
 
+sub remove {
+  $::lxdebug->enter_sub;
+  assert_bp_access();
 
+  $::form->info($::locale->text('Removing marked entries from queue ...'));
+  $::form->{callback} .= "&header=1" if $::form->{callback};
 
-sub yes {
-  $lxdebug->enter_sub();
-
-
-  $form->info($locale->text('Removing marked entries from queue ...'));
-  $form->{callback} .= "&header=1" if $form->{callback};
-
-  $form->redirect($locale->text('Removed spoolfiles!')) if (BP->delete_spool(\%myconfig, \%$form, $spool));
-  $form->error($locale->text('Cannot remove files!'));
+  $::form->redirect($::locale->text('Removed spoolfiles!'))
+    if BP->delete_spool(\%::myconfig, $::form);
+  $::form->error($::locale->text('Cannot remove files!'));
 
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
-
 sub print {
-  $lxdebug->enter_sub();
+  $::lxdebug->enter_sub;
+  assert_bp_access();
 
+  $::form->get_lists(printers => 'ALL_PRINTERS');
+  # use the command stored in the databse or fall back to $myconfig{printer}
+  my $selected_printer =  first { $_ } map ({ $_ ->{printer_command} }
+                                         grep { $_->{id} eq $::form->{printer} }
+                                           @{ $::form->{ALL_PRINTERS} }),
+                                       $::myconfig{printer};
 
-  if ($form->{callback}) {
-    map { $form->{callback} .= "&checked_$_=1" if $form->{"checked_$_"} } (1 .. $form->{rowcount});
-    $form->{callback} .= "&header=1";
+  if ($::form->{callback}) {
+    map { $::form->{callback} .= "&checked_$_=1" if $::form->{"checked_$_"} }
+      (1 .. $::form->{rowcount});
+    $::form->{callback} .= "&header=1";
   }
 
-  for $i (1 .. $form->{rowcount}) {
-    if ($form->{"checked_$i"}) {
-      $form->{OUT} = "| $myconfig{printer}";
-      $form->info($locale->text('Printing ... '));
+  for my $i (1 .. $::form->{rowcount}) {
+    if ($::form->{"checked_$i"}) {
+      $::form->info($::locale->text('Printing ... '));
 
-      if (BP->print_spool(\%myconfig, \%$form, $spool)) {
-	print $locale->text('done');
-	$form->redirect($locale->text('Marked entries printed!'));
+      if (BP->print_spool(\%::myconfig, $::form, "| $selected_printer")) {
+        print $::locale->text('done');
+        $::form->redirect($::locale->text('Marked entries printed!'));
       }
-      exit;
+      ::end_of_request();
     }
   }
 
-  $form->error('Nothing selected!');
+  $::form->error('Nothing selected!');
 
-  $lxdebug->leave_sub();
+  $::lxdebug->leave_sub;
 }
 
-
 sub list_spool {
-  $lxdebug->enter_sub();
-
-
-  $form->{$form->{vc}} = $form->unescape($form->{$form->{vc}});
-  ($form->{$form->{vc}}, $form->{"$form->{vc}_id"}) = split(/--/, $form->{$form->{vc}});
-
-  BP->get_spoolfiles(\%myconfig, \%$form);
-
-  $title = $form->escape($form->{title});
-  $href = "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title";
-  
-  $title = $form->escape($form->{title},1);
-  $callback = "$form->{script}?action=list_spool&path=$form->{path}&login=$form->{login}&password=$form->{password}&vc=$form->{vc}&type=$form->{type}&title=$title";
-
-  if ($form->{$form->{vc}}) {
-    $callback .= "&$form->{vc}=".$form->escape($form->{$form->{vc}},1);
-    $href .= "&$form->{vc}=".$form->escape($form->{$form->{vc}});
-    $option = ($form->{vc} eq 'customer') ? $locale->text('Customer') : $locale->text('Vendor');
-    $option .= " : $form->{$form->{vc}}";
-  }
-  if ($form->{account}) {
-    $callback .= "&account=".$form->escape($form->{account},1);
-    $href .= "&account=".$form->escape($form->{account});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Account')." : $form->{account}";
-  }
-  if ($form->{invnumber}) {
-    $callback .= "&invnumber=".$form->escape($form->{invnumber},1);
-    $href .= "&invnumber=".$form->escape($form->{invnumber});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Invoice Number')." : $form->{invnumber}";
-  }
-  if ($form->{ordnumber}) {
-    $callback .= "&ordnumber=".$form->escape($form->{ordnumber},1);
-    $href .= "&ordnumber=".$form->escape($form->{ordnumber});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Order Number')." : $form->{ordnumber}";
-  }
-  if ($form->{quonumber}) {
-    $callback .= "&quonumber=".$form->escape($form->{quonumber},1);
-    $href .= "&quonumber=".$form->escape($form->{quonumber});
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('Quotation Number')." : $form->{quonumber}";
-  }
- 
-  if ($form->{transdatefrom}) {
-    $callback .= "&transdatefrom=$form->{transdatefrom}";
-    $href .= "&transdatefrom=$form->{transdatefrom}";
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('From')."&nbsp;".$locale->date(\%myconfig, $form->{transdatefrom}, 1);
-  }
-  if ($form->{transdateto}) {
-    $callback .= "&transdateto=$form->{transdateto}";
-    $href .= "&transdateto=$form->{transdateto}";
-    $option .= "\n<br>" if ($option);
-    $option .= $locale->text('To')."&nbsp;".$locale->date(\%myconfig, $form->{transdateto}, 1);
-  }
-
-  $name = ucfirst $form->{vc};
-  
-  @columns = (transdate);
-  if ($form->{type} =~ /(invoice|packing_list|check|receipt)/) {
-    push @columns, "invnumber";
-  }
-  if ($form->{type} =~ /_order$/) {
-    push @columns, "ordnumber";
-  }
-  if ($form->{type} =~ /_quotation$/) {
-    push @columns, "quonumber";
-  }
-
-  push @columns, (name, spoolfile);
-  @column_index = $form->sort_columns(@columns);
-  unshift @column_index, "checked";
-
-  $column_header{checked} = "<th class=listheading>&nbsp;</th>";
-  $column_header{transdate} = "<th><a class=listheading href=$href&sort=transdate>".$locale->text('Date')."</a></th>";
-  $column_header{invnumber} = "<th><a class=listheading href=$href&sort=invnumber>".$locale->text('Invoice')."</a></th>";
-  $column_header{ordnumber} = "<th><a class=listheading href=$href&sort=ordnumber>".$locale->text('Order')."</a></th>";
-  $column_header{quonumber} = "<th><a class=listheading href=$href&sort=quonumber>".$locale->text('Quotation')."</a></th>";
-  $column_header{name} = "<th><a class=listheading href=$href&sort=name>".$locale->text($name)."</a></th>";
-  $column_header{spoolfile} = "<th class=listheading>".$locale->text('Spoolfile')."</th>";
-
-
-  $form->header;
-
-  print qq|
-<body>
-
-<form method=post action=$form->{script}>
-
-<table width=100%>
-  <tr>
-    <th class=listtop>$form->{title}</th>
-  </tr>
-  <tr height="5"></tr>
-  <tr>
-    <td>$option</td>
-  </tr>
-  <tr>
-    <td>
-      <table width=100%>
-	<tr class=listheading>
-|;
-
-  map { print "\n$column_header{$_}" } @column_index;
-
-  print qq|
-	</tr>
-|;
-
-
-  # add sort and escape callback, this one we use for the add sub
-  $form->{callback} = $callback .= "&sort=$form->{sort}";
-
-  # escape callback for href
-  $callback = $form->escape($callback);
-  
-  $i = 0;
-  
-  foreach $ref (@{ $form->{SPOOL} }) {
-
-    $i++;
-   
-    $form->{"checked_$i"} = "checked" if $form->{"checked_$i"};
-    
-    if ($ref->{invoice}) {
-      $ref->{module} = ($ref->{module} eq 'ar') ? "is" : "ir";
-    }
-    $module = "$ref->{module}.pl";
-    
-    $column_data{transdate} = "<td>$ref->{transdate}&nbsp;</td>";
-
-    if ($spoolfile eq $ref->{spoolfile}) {
-      $column_data{checked} = qq|<td></td>|;
-    } else {
-      $column_data{checked} = qq|<td><input name=checked_$i type=checkbox style=checkbox $form->{"checked_$i"} $form->{"checked_$i"}></td>|;
-    }
-    
-    $column_data{invnumber} = "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{invnumber}</a></td>";
-    $column_data{ordnumber} = "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{ordnumber}</a></td>";
-    $column_data{quonumber} = "<td><a href=$module?action=edit&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&type=$form->{type}&callback=$callback>$ref->{quonumber}</a></td>";
-    $column_data{name} = "<td>$ref->{name}</td>";
-    $column_data{spoolfile} = qq|<td><a href=$spool/$ref->{spoolfile}>$ref->{spoolfile}</a></td>
-<input type=hidden name="spoolfile_$i" value=$ref->{spoolfile}>
-|;
-
-    $spoolfile = $ref->{spoolfile};
-    
-    $j++; $j %= 2;
-    print "
-        <tr class=listrow$j>
-";
-
-    map { print "\n$column_data{$_}" } @column_index;
-
-    print qq|
-        </tr>
-|;
-
-  }
-
-  print qq|
-<input type=hidden name=rowcount value=$i>
-
-      </table>
-    </td>
-  </tr>
-  <tr>
-    <td><hr size=3 noshade></td>
-  </tr>
-</table>
-
-<br>
-
-<input name=callback type=hidden value="$form->{callback}">
-
-<input type=hidden name=title value="$form->{title}">
-<input type=hidden name=vc value="$form->{vc}">
-<input type=hidden name=type value="$form->{type}">
-<input type=hidden name=sort value="$form->{sort}">
-
-<input type=hidden name=account value="$form->{account}">
-
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-|;
-
-  if ($myconfig{printer}) {
-    print qq|
-<input class=submit type=submit name=action value="|.$locale->text('Select all').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('Print').qq|">
-<input class=submit type=submit name=action value="|.$locale->text('Remove').qq|">
-|;
-  }
-
-  if ($form->{menubar}) {
-    require "$form->{path}/menu.pl";
-    &menubar;
-  }
-
-  print qq|
-</form>
-
-</body>
-</html>
-|;
-
-  $lxdebug->leave_sub();
+  $::lxdebug->enter_sub;
+  assert_bp_access();
+
+  # parse old vc picker
+  $::form->{ $::form->{vc} } = $::form->unescape($::form->{ $::form->{vc} });
+  ($::form->{ $::form->{vc} }, $::form->{"$::form->{vc}_id"}) = split(/--/, $::form->{ $::form->{vc} });
+
+  BP->get_spoolfiles(\%::myconfig, $::form);
+
+  my @href_options = ('vc', 'type', 'title', $::form->{vc});
+
+  my %option_texts = (
+    customer      => sub { $::locale->text('Customer')         . " : $::form->{customer}" },
+    vendor        => sub { $::locale->text('Customer')         . " : $::form->{vendor}" },
+    account       => sub { $::locale->text('Account')          . " : $::form->{account}" },
+    invnumber     => sub { $::locale->text('Invoice Number')   . " : $::form->{invnumber}" },
+    ordnumber     => sub { $::locale->text('Order Number')     . " : $::form->{ordnumber}" },
+    quonumber     => sub { $::locale->text('Quotation Number') . " : $::form->{quonumber}" },
+    transdatefrom => sub { $::locale->text('From') . "&nbsp;" . $::locale->date(\%::myconfig, $::form->{transdatefrom}, 1) },
+    transdateto   => sub { $::locale->text('To')   . "&nbsp;" . $::locale->date(\%::myconfig, $::form->{transdateto}, 1) },
+  );
+
+  my @options;
+  for my $key ($::form->{vc}, qw(account invnumber ordnumber quonumber transdatefrom transdateto)) {
+    next unless $::form->{$key};
+    push @href_options, $key;
+    push @options, $option_texts{$key} ? $option_texts{$key}->() : '';
+  }
+
+  my $last_spoolfile;
+  for my $ref (@{ $::form->{SPOOL} }) {
+    $ref->{module}   = ($ref->{module} eq 'ar') ? "is" : "ir" if $ref->{invoice};
+    $ref->{new_file} = $last_spoolfile ne $ref->{spoolfile};
+  } continue {
+    $last_spoolfile = $ref->{spoolfile};
+  }
+
+  $::form->get_lists(printers => "ALL_PRINTERS");
+
+  $::form->header;
+  print $::form->parse_html_template('bp/list_spool', {
+     spool        => $::lx_office_conf{paths}->{spool},
+     href         => build_std_url('bp.pl', @href_options),
+     is_invoice   => scalar ($::form->{type} =~ /^invoice$/),
+     is_order     => scalar ($::form->{type} =~ /_order$/),
+     is_quotation => scalar ($::form->{type} =~ /_quotation$/),
+     options      => \@options,
+  });
+
+  $::lxdebug->leave_sub;
 }
 
-
-sub select_all {
-  $lxdebug->enter_sub();
-
-
-  map { $form->{"checked_$_"} = 1 } (1 .. $form->{rowcount});
-  &list_spool;
-  
-  $lxdebug->leave_sub();
-}
-
-
-sub continue { &{ $form->{nextsub} } };
-
+sub continue { call_sub($::form->{"nextsub"}); }