amcvar strict

diff --git a/bin/mozilla/amcvar.pl b/bin/mozilla/amcvar.pl
index a3e281ff67d805655b844211a2063fa49cd6ae73..6c6865cc3da9e0053a4a66c42e6b210a0ba39a5a 100644 (file)
--- a/bin/mozilla/amcvar.pl
+++ b/bin/mozilla/amcvar.pl
@@ -38,12 +38,15 @@ use SL::Form;
 use Data::Dumper;
 use List::MoreUtils qw(any);
 
 use Data::Dumper;
 use List::MoreUtils qw(any);
 

-1;
-

 require "bin/mozilla/common.pl";
 
 require "bin/mozilla/common.pl";
 

+use strict;
+
+1;
+

 # end of main
 
 # end of main
 

+my $locale   = $main::locale;

 our %translations = ('text'      => $locale->text('Free-form text'),
                      'textfield' => $locale->text('Text field'),
                      'number'    => $locale->text('Number'),
 our %translations = ('text'      => $locale->text('Free-form text'),
                      'textfield' => $locale->text('Text field'),
                      'number'    => $locale->text('Number'),


@@ -75,9 +78,12 @@ sub _is_valid_module {
 }
 
 sub list_cvar_configs {
 }
 
 sub list_cvar_configs {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;

 
 

-  $auth->assert('config');
+  $main::auth->assert('config');

 
   $form->{module} = $form->{module} || $form->{cvar_module} || 'CT';
   $form->{module} = 'CT' unless _is_valid_module($form->{module});
 
   $form->{module} = $form->{module} || $form->{cvar_module} || 'CT';
   $form->{module} = 'CT' unless _is_valid_module($form->{module});


@@ -104,26 +110,30 @@ sub list_cvar_configs {
 
   $main::lxdebug->dump(0, "modules", \@modules);
 
 
   $main::lxdebug->dump(0, "modules", \@modules);
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub add_cvar_config {
 }
 
 sub add_cvar_config {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;

 
 

-  $auth->assert('config');
+  $main::auth->assert('config');

 
   $form->{module} = $form->{module} || $form->{cvar_module} || 'CT';
 
   $form->{edit} = 0;
   display_cvar_config_form();
 
 
   $form->{module} = $form->{module} || $form->{cvar_module} || 'CT';
 
   $form->{edit} = 0;
   display_cvar_config_form();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub edit_cvar_config {
 }
 
 sub edit_cvar_config {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();

 
 

-  $auth->assert('config');
+  my $form     = $main::form;
+
+  $main::auth->assert('config');

 
   my $config = CVar->get_config('id' => $form->{id});
 
 
   my $config = CVar->get_config('id' => $form->{id});
 


@@ -132,13 +142,17 @@ sub edit_cvar_config {
   $form->{edit} = 1;
   display_cvar_config_form();
 
   $form->{edit} = 1;
   display_cvar_config_form();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub save {
 }
 
 sub save {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;

 
 

-  $auth->assert('config');
+  $main::auth->assert('config');

 
   $form->isblank('name',        $locale->text('The name is missing.'));
   $form->isblank('description', $locale->text('The description is missing.'));
 
   $form->isblank('name',        $locale->text('The name is missing.'));
   $form->isblank('description', $locale->text('The description is missing.'));


@@ -163,11 +177,14 @@ sub save {
 
   list_cvar_configs();
 
 
   list_cvar_configs();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub delete {
 }
 
 sub delete {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my $locale   = $main::locale;

 
   CVar->delete_config('id' => $form->{id});
 
 
   CVar->delete_config('id' => $form->{id});
 


@@ -175,13 +192,17 @@ sub delete {
 
   list_cvar_configs();
 
 
   list_cvar_configs();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub display_cvar_config_form {
 }
 
 sub display_cvar_config_form {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();

 
 

-  $auth->assert('config');
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;
+  my $locale   = $main::locale;
+
+  $main::auth->assert('config');

 
   my @types = map { { 'type' => $_, 'type_tr' => $translations{$_} } } @types;
 
 
   my @types = map { { 'type' => $_, 'type_tr' => $translations{$_} } } @types;
 


@@ -195,20 +216,26 @@ sub display_cvar_config_form {
   print $form->parse_html_template("amcvar/display_cvar_config_form", { TYPES   => \@types,
                                                                         MODULES => \@modules });
 
   print $form->parse_html_template("amcvar/display_cvar_config_form", { TYPES   => \@types,
                                                                         MODULES => \@modules });
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub swap_cvar_configs {
 }
 
 sub swap_cvar_configs {

-  $lxdebug->enter_sub();
+  $main::lxdebug->enter_sub();
+
+  my $form     = $main::form;
+  my %myconfig = %main::myconfig;

 
   AM->swap_sortkeys(\%myconfig, $form, 'custom_variable_configs');
 
   list_cvar_configs();
 
 
   AM->swap_sortkeys(\%myconfig, $form, 'custom_variable_configs');
 
   list_cvar_configs();
 

-  $lxdebug->leave_sub();
+  $main::lxdebug->leave_sub();

 }
 
 sub dispatcher {
 }
 
 sub dispatcher {

+  my $form     = $main::form;
+  my $locale   = $main::locale;
+

   foreach my $action (qw(list_cvar_configs add_cvar_config)) {
     if ($form->{"action_${action}"}) {
       call_sub($action);
   foreach my $action (qw(list_cvar_configs add_cvar_config)) {
     if ($form->{"action_${action}"}) {
       call_sub($action);