X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/7ba6d673fa3b5a9316759670c74e645dd63995fe..5b22b6b5b7dbb290048cd15b3ede7d18cba4d09c:/bin/mozilla/pe.pl

diff --git a/bin/mozilla/pe.pl b/bin/mozilla/pe.pl
index 18c90c30a..5a617ba4d 100644
--- a/bin/mozilla/pe.pl
+++ b/bin/mozilla/pe.pl
@@ -43,21 +43,26 @@ require "bin/mozilla/common.pl";
 sub add {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   $form->{title} = "Add";
 
   # construct callback
   $form->{callback} =
-    "$form->{script}?action=add&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}"
+    "$form->{script}?action=add&type=$form->{type}"
     unless $form->{callback};
 
-  &{"form_$form->{type}_header"};
-  &{"form_$form->{type}_footer"};
+  call_sub("form_$form->{type}_header");
+  call_sub("form_$form->{type}_footer");
 
   $lxdebug->leave_sub();
 }
 
 sub edit {
   $lxdebug->enter_sub();
+
+  $auth->assert('config');
+
   # show history button
   $form->{javascript} = qq|<script type="text/javascript" src="js/show_history.js"></script>|;
   #/show hhistory button
@@ -72,8 +77,8 @@ sub edit {
   if ($form->{type} eq 'pricegroup') {
     PE->get_pricegroup(\%myconfig, \%$form);
   }
-  &{"form_$form->{type}_header"};
-  &{"form_$form->{type}_footer"};
+  call_sub("form_$form->{type}_header");
+  call_sub("form_$form->{type}_footer");
 
   $lxdebug->leave_sub();
 }
@@ -81,6 +86,8 @@ sub edit {
 sub search {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   if ($form->{type} eq 'project') {
     $report        = "project_report";
     $sort          = 'projectnumber';
@@ -173,10 +180,6 @@ sub search {
 
 <input type=hidden name=nextsub value=$report>
 
-<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|">
@@ -192,12 +195,14 @@ sub search {
 sub project_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   map { $form->{$_} = $form->unescape($form->{$_}) }
     (projectnumber, description);
   PE->projects(\%myconfig, \%$form);
 
   $callback =
-    "$form->{script}?action=project_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}&active=" .
+    "$form->{script}?action=project_report&type=$form->{type}&status=$form->{status}&active=" .
     E($form->{active});
   $href = $callback;
 
@@ -278,7 +283,7 @@ sub project_report {
 |;
 
     $column_data{projectnumber} =
-      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{projectnumber}</td>|;
+      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&callback=$callback>$ref->{projectnumber}</td>|;
     $column_data{description} = qq|<td>$ref->{description}&nbsp;</td>|;
     $column_data{active} =
       qq|<td>| .
@@ -308,10 +313,6 @@ sub project_report {
 
 <input type=hidden name=type value=$form->{type}>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -327,6 +328,8 @@ sub project_report {
 sub form_project_header {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   $form->{title} = $locale->text("$form->{title} Project");
 
   # $locale->text('Add Project')
@@ -409,14 +412,12 @@ sub form_project_header {
 sub form_project_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   print qq|
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<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 type=submit class=submit name=action value="|
     . $locale->text('Save') . qq|">
 |;
@@ -427,14 +428,17 @@ sub form_project_footer {
       . $locale->text('Delete') . qq|">|;
   }
 
-# button for saving history
-print qq|
-  	<input type=button onclick=set_history_window(|
-  	. $form->{id} 
-  	. qq|); name=history id=history value=|
-  	. $locale->text('history') 
-  	. qq|>|;
-# /button for saving history
+  if ($form->{id}) {
+    # button for saving history
+    print qq|
+      <input type=button onclick=set_history_window(|
+      . $form->{id}
+      . qq|); name=history id=history value=|
+      . $locale->text('history')
+      . qq|>|;
+    # /button for saving history
+  }
+
   print qq|
 </form>
 
@@ -448,6 +452,8 @@ print qq|
 sub save {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   if ($form->{type} eq 'project') {
     $form->isblank("projectnumber", $locale->text('Project Number missing!'));
     PE->save_project(\%myconfig, \%$form);
@@ -467,6 +473,7 @@ sub save {
   }
   # saving the history
   if(!exists $form->{addition} && $form->{id} ne "") {
+    $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
   	$form->{addition} = "SAVED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -478,6 +485,8 @@ sub save {
 sub delete {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   PE->delete_tuple(\%myconfig, \%$form);
 
   if ($form->{type} eq 'project') {
@@ -491,6 +500,7 @@ sub delete {
   }
   # saving the history
   if(!exists $form->{addition}) {
+    $form->{snumbers} = qq|projectnumber_| . $form->{projectnumber};
   	$form->{addition} = "DELETED";
   	$form->save_history($form->dbconnect(\%myconfig));
   }
@@ -498,16 +508,18 @@ sub delete {
   $lxdebug->leave_sub();
 }
 
-sub continue { &{ $form->{nextsub} } }
+sub continue { call_sub($form->{"nextsub"}); }
 
 sub partsgroup_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   map { $form->{$_} = $form->unescape($form->{$_}) } (partsgroup);
   PE->partsgroups(\%myconfig, \%$form);
 
   $callback =
-    "$form->{script}?action=partsgroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+    "$form->{script}?action=partsgroup_report&type=$form->{type}&status=$form->{status}";
 
   if ($form->{status} eq 'all') {
     $option = $locale->text('All');
@@ -568,7 +580,7 @@ sub partsgroup_report {
 |;
 
     $column_data{partsgroup} =
-      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{partsgroup}</td>|;
+      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&callback=$callback>$ref->{partsgroup}</td>|;
     map { print "$column_data{$_}\n" } @column_index;
 
     print "
@@ -592,10 +604,6 @@ sub partsgroup_report {
 
 <input type=hidden name=type value=$form->{type}>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -611,6 +619,8 @@ sub partsgroup_report {
 sub form_partsgroup_header {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   $form->{title} = $locale->text("$form->{title} Group");
 
   # $locale->text('Add Group')
@@ -656,14 +666,12 @@ sub form_partsgroup_header {
 sub form_partsgroup_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   print qq|
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<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 type=submit class=submit name=action value="|
     . $locale->text('Save') . qq|">
 |;
@@ -698,11 +706,13 @@ print qq|
 sub pricegroup_report {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   map { $form->{$_} = $form->unescape($form->{$_}) } (pricegroup);
   PE->pricegroups(\%myconfig, \%$form);
 
   $callback =
-    "$form->{script}?action=pricegroup_report&type=$form->{type}&path=$form->{path}&login=$form->{login}&password=$form->{password}&status=$form->{status}";
+    "$form->{script}?action=pricegroup_report&type=$form->{type}&status=$form->{status}";
 
   if ($form->{status} eq 'all') {
     $option = $locale->text('All');
@@ -765,7 +775,7 @@ sub pricegroup_report {
         <tr valign=top class=listrow$i>
 |;
     $column_data{pricegroup} =
-      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&path=$form->{path}&login=$form->{login}&password=$form->{password}&callback=$callback>$ref->{pricegroup}</td>|;
+      qq|<td><a href=$form->{script}?action=edit&type=$form->{type}&status=$form->{status}&id=$ref->{id}&callback=$callback>$ref->{pricegroup}</td>|;
 
     map { print "$column_data{$_}\n" } @column_index;
 
@@ -790,10 +800,6 @@ sub pricegroup_report {
 
 <input type=hidden name=type value=$form->{type}>
 
-<input type=hidden name=path value=$form->{path}>
-<input type=hidden name=login value=$form->{login}>
-<input type=hidden name=password value=$form->{password}>
-
 <input class=submit type=submit name=action value="|
     . $locale->text('Add') . qq|">
 
@@ -812,6 +818,8 @@ sub pricegroup_report {
 sub form_pricegroup_header {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   # $locale->text('Add Pricegroup')
   # $locale->text('Edit Pricegroup')
 
@@ -858,14 +866,12 @@ sub form_pricegroup_header {
 sub form_pricegroup_footer {
   $lxdebug->enter_sub();
 
+  $auth->assert('config');
+
   print qq|
 
 <input name=callback type=hidden value="$form->{callback}">
 
-<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 type=submit class=submit name=action value="|
     . $locale->text('Save') . qq|">
 |;