Benutzerrechteüberprüfung für die io.pl in eine eigene Funktion ausgelagert.

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index e66c7350674c7bd2c3fe52af7b58903d8184ac60..f81376d998aa5333d24fe29ee785065b91b19ead 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -88,6 +88,13 @@ use SL::IS;
 use SL::PE;
 use SL::AM;
 use Data::Dumper;
 use SL::PE;
 use SL::AM;
 use Data::Dumper;

+
+sub _check_io_auth {
+  $auth->assert('part_service_assembly_edit   | vendor_invoice_edit       | sales_order_edit    | invoice_edit |' .
+                'request_quotation_edit       | sales_quotation_edit      | purchase_order_edit | ' .
+                'purchase_delivery_order_edit | sales_delivery_order_edit');
+}
+

 ########################################
 # Eintrag fuer Version 2.2.0 geaendert #
 # neue Optik im Rechnungsformular      #
 ########################################
 # Eintrag fuer Version 2.2.0 geaendert #
 # neue Optik im Rechnungsformular      #


@@ -95,9 +102,7 @@ use Data::Dumper;
 sub display_row {
   $lxdebug->enter_sub();
 
 sub display_row {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit | ' .
-                'sales_delivery_order_edit  | purchase_delivery_order_edit');
+  _check_io_auth();

 
   my $numrows = shift;
 
 
   my $numrows = shift;
 


@@ -366,8 +371,7 @@ sub display_row {
 sub set_pricegroup {
   $lxdebug->enter_sub();
 
 sub set_pricegroup {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   my $rowcount = shift;
   for $j (1 .. $rowcount) {
 
   my $rowcount = shift;
   for $j (1 .. $rowcount) {


@@ -390,8 +394,7 @@ sub set_pricegroup {
 sub select_item {
   $lxdebug->enter_sub();
 
 sub select_item {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   @column_index = qw(ndx partnumber description onhand unit sellprice);
 
 
   @column_index = qw(ndx partnumber description onhand unit sellprice);
 


@@ -521,8 +524,7 @@ sub select_item {
 sub item_selected {
   $lxdebug->enter_sub();
 
 sub item_selected {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   # replace the last row with the checked row
   $i = $form->{rowcount};
 
   # replace the last row with the checked row
   $i = $form->{rowcount};


@@ -622,8 +624,7 @@ sub item_selected {
 sub new_item {
   $lxdebug->enter_sub();
 
 sub new_item {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   # change callback
   $form->{old_callback} = $form->escape($form->{callback}, 1);
 
   # change callback
   $form->{old_callback} = $form->escape($form->{callback}, 1);


@@ -646,8 +647,7 @@ sub new_item {
 sub check_form {
   $lxdebug->enter_sub();
 
 sub check_form {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   my @a     = ();
   my $count = 0;
 
   my @a     = ();
   my $count = 0;


@@ -754,8 +754,7 @@ sub check_form {
 sub invoicetotal {
   $lxdebug->enter_sub();
 
 sub invoicetotal {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   $form->{oldinvtotal} = 0;
 
 
   $form->{oldinvtotal} = 0;
 


@@ -795,8 +794,7 @@ sub invoicetotal {
 sub validate_items {
   $lxdebug->enter_sub();
 
 sub validate_items {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   # check if items are valid
   if ($form->{rowcount} == 1) {
 
   # check if items are valid
   if ($form->{rowcount} == 1) {


@@ -815,8 +813,7 @@ sub validate_items {
 sub order {
   $lxdebug->enter_sub();
 
 sub order {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;


@@ -886,8 +883,7 @@ sub order {
 sub quotation {
   $lxdebug->enter_sub();
 
 sub quotation {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;


@@ -954,8 +950,7 @@ sub request_for_quotation {
 sub edit_e_mail {
   $lxdebug->enter_sub();
 
 sub edit_e_mail {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;


@@ -997,8 +992,7 @@ sub edit_e_mail {
 sub send_email {
   $lxdebug->enter_sub();
 
 sub send_email {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id));
 
   my $callback = $form->{script} . "?action=edit";
   map({ $callback .= "\&${_}=" . E($form->{$_}); } qw(type id));


@@ -1025,9 +1019,7 @@ sub send_email {
 sub print_options {
   $lxdebug->enter_sub();
 
 sub print_options {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit     | vendor_invoice_edit        | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit         | sales_quotation_edit       | purchase_order_edit | dunning_edit |' .
-                'sales_delivery_order_edit      | purchase_delivery_order_edit');
+  _check_io_auth();

 
   my %options = @_;
 
 
   my %options = @_;
 


@@ -1141,9 +1133,7 @@ sub print_options {
 sub print {
   $lxdebug->enter_sub();
 
 sub print {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit   | vendor_invoice_edit       | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit       | sales_quotation_edit      | purchase_order_edit | ' .
-                'purchase_delivery_order_edit | sales_delivery_order_edit');
+  _check_io_auth();

 
   if ($form->{print_nextsub}) {
     call_sub($form->{print_nextsub});
 
   if ($form->{print_nextsub}) {
     call_sub($form->{print_nextsub});


@@ -1180,9 +1170,7 @@ sub print {
 sub print_form {
   $lxdebug->enter_sub();
 
 sub print_form {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit     | vendor_invoice_edit        | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit         | sales_quotation_edit       | purchase_order_edit |' .
-                'sales_delivery_order_edit      | purchase_delivery_order_edit');
+  _check_io_auth();

 
   my ($old_form) = @_;
 
 
   my ($old_form) = @_;
 


@@ -1618,7 +1606,9 @@ sub print_form {
 
 sub customer_details {
   $lxdebug->enter_sub();
 
 sub customer_details {
   $lxdebug->enter_sub();

+

   IS->customer_details(\%myconfig, \%$form, @_);
   IS->customer_details(\%myconfig, \%$form, @_);

+

   $lxdebug->leave_sub();
 }
 
   $lxdebug->leave_sub();
 }
 


@@ -1633,8 +1623,7 @@ sub vendor_details {
 sub post_as_new {
   $lxdebug->enter_sub();
 
 sub post_as_new {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   $form->{postasnew} = 1;
   map { delete $form->{$_} } qw(printed emailed queued);
 
   $form->{postasnew} = 1;
   map { delete $form->{$_} } qw(printed emailed queued);


@@ -1647,8 +1636,7 @@ sub post_as_new {
 sub ship_to {
   $lxdebug->enter_sub();
 
 sub ship_to {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;
 
   if ($form->{second_run}) {
     $form->{print_and_post} = 0;


@@ -1802,8 +1790,7 @@ sub ship_to {
 sub new_license {
   $lxdebug->enter_sub();
 
 sub new_license {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   my $row = shift;
 
 
   my $row = shift;
 


@@ -1844,8 +1831,7 @@ sub new_license {
 sub relink_accounts {
   $lxdebug->enter_sub();
 
 sub relink_accounts {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   $form->{"taxaccounts"} =~ s/\s*$//;
   $form->{"taxaccounts"} =~ s/^\s*//;
 
   $form->{"taxaccounts"} =~ s/\s*$//;
   $form->{"taxaccounts"} =~ s/^\s*//;


@@ -1866,8 +1852,7 @@ sub relink_accounts {
 sub set_duedate {
   $lxdebug->enter_sub();
 
 sub set_duedate {
   $lxdebug->enter_sub();
 

-  $auth->assert('part_service_assembly_edit | vendor_invoice_edit  | sales_order_edit    | invoice_edit |' .
-                'request_quotation_edit     | sales_quotation_edit | purchase_order_edit');
+  _check_io_auth();

 
   $form->get_duedate(\%myconfig);
 
 
   $form->get_duedate(\%myconfig);
 


@@ -1875,7 +1860,7 @@ sub set_duedate {
   $result = "$form->{duedate}";
   print $q->header();
   print $result;
   $result = "$form->{duedate}";
   print $q->header();
   print $result;

-  $lxdebug->leave_sub();

 
 

+  $lxdebug->leave_sub();

 }
 
 }
 

diff --git a/locale/de/dn b/locale/de/dn
index 40967357fed45962521626fe0e7dad22f4c80e5b..7652dc7d37dd765828e035bbd2c753bdfad6b4f6 100644 (file)
--- a/locale/de/dn
+++ b/locale/de/dn
@@ -284,6 +284,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',

diff --git a/locale/de/do b/locale/de/do
index 8c650484f73f4995fd87d205ae49fabba9e83377..135efef28dd194aff039d470058b76143cce2899 100644 (file)
--- a/locale/de/do
+++ b/locale/de/do
@@ -301,6 +301,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',

diff --git a/locale/de/ic b/locale/de/ic
index b59e1026da13b001a1c97941ff214505b059503f..6d73272b3c886562b75da8871de89427211a380e 100644 (file)
--- a/locale/de/ic
+++ b/locale/de/ic
@@ -337,6 +337,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'addtop100'                   => 'addtop100',
   'acc_menu'                    => 'acc_menu',
   'add'                         => 'add',
   'addtop100'                   => 'addtop100',

diff --git a/locale/de/io b/locale/de/io
index 7642289f5aee046b772aa6b7c2b0199c54120ada..81aa77a089c9ade8b4b5c84daf11faa52560193e 100644 (file)
--- a/locale/de/io
+++ b/locale/de/io
@@ -245,6 +245,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'call_sub'                    => 'call_sub',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'call_sub'                    => 'call_sub',

diff --git a/locale/de/ir b/locale/de/ir
index 04b39ed4519cca17d045dfcac8a0234d413214f8..38a754c898cc2b10d850efc55c01ed812a9aaf0a 100644 (file)
--- a/locale/de/ir
+++ b/locale/de/ir
@@ -315,6 +315,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',

diff --git a/locale/de/is b/locale/de/is
index 8ed1ad3fed106fbb4e64707b4750ec2ad8ef043b..a4592f80ea1fa22712b7bf949130b201d6bf802f 100644 (file)
--- a/locale/de/is
+++ b/locale/de/is
@@ -341,6 +341,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',
   'add'                         => 'add',
   'build_std_url'               => 'build_std_url',
   'calculate_qty'               => 'calculate_qty',

diff --git a/locale/de/login b/locale/de/login
index 81486c123cea2d5cdc2bd4b61e294437f8a67d96..1abd2fc9c4b3745603bee4bc7c20c910b6696a8f 100644 (file)
--- a/locale/de/login
+++ b/locale/de/login
@@ -386,6 +386,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   '_collect_links'              => '_collect_links',
   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',
   '_collect_links'              => '_collect_links',
   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',

diff --git a/locale/de/oe b/locale/de/oe
index a52d29e558b58a2ce123908b2d7c7d4a8545cf6b..8e2da78b01fefd9c072780e01ae84e9dbab4653b 100644 (file)
--- a/locale/de/oe
+++ b/locale/de/oe
@@ -353,6 +353,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',
   'build_std_url'               => 'build_std_url',
   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',
   'build_std_url'               => 'build_std_url',

diff --git a/locale/de/todo b/locale/de/todo
index 81149d66ef0eef072a3a49669694b06739008b86..6312f8e283966f4def565f7633ef3fa8c0c0cddc 100644 (file)
--- a/locale/de/todo
+++ b/locale/de/todo
@@ -379,6 +379,7 @@ $self->{subs} = {
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',
   'H'                           => 'H',
   'NTI'                         => 'NTI',
   'Q'                           => 'Q',

+  '_check_io_auth'              => '_check_io_auth',

   '_collect_links'              => '_collect_links',
   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',
   '_collect_links'              => '_collect_links',
   'add'                         => 'add',
   'backorder_exchangerate'      => 'backorder_exchangerate',